Merge remote-tracking branch 'origin/huoshan'

# Conflicts:
#	hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java

hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareClient.java

@@ -1,6 +1,8 @@
 package com.hnac.hzims.spare.feign;
 
+import com.hnac.hzims.operational.census.vo.AreaTimelyVo;
 import com.hnac.hzims.spare.entity.*;
+import com.hnac.hzims.spare.vo.ExceedVo;
 import com.hnac.hzims.spare.vo.WtSpBasicVO;
 import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -19,6 +21,8 @@ public interface ISpareClient {
     String API_PREFIX = "/client";
     String WAREHOUSEOUT = API_PREFIX+"/warehouseOut";
 
+    String EXCEED_LIMIT = API_PREFIX + "/exceedLimit" ;
+
     /**
      * 保存工单与出库单关联信息
      * @param recordEntity
@@ -26,4 +30,7 @@ public interface ISpareClient {
      */
     @PostMapping(WAREHOUSEOUT)
     Boolean warehouseOut(@RequestBody SpRecordEntity recordEntity);
+
+    @PostMapping(EXCEED_LIMIT)
+    List<AreaTimelyVo> exceedLimit(@RequestParam("deptId") Long deptId);
 }

hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareClientFallback.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.spare.feign;
 
+import com.hnac.hzims.operational.census.vo.AreaTimelyVo;
 import com.hnac.hzims.spare.entity.*;
 import com.hnac.hzims.spare.vo.WtSpBasicVO;
 import org.springblade.core.tool.api.R;
@@ -7,6 +8,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -17,4 +19,9 @@ public class ISpareClientFallback implements ISpareClient {
 	public Boolean warehouseOut(SpRecordEntity recordEntity) {
 		return false;
 	}
+
+	@Override
+	public List<AreaTimelyVo> exceedLimit(Long deptId) {
+		return new ArrayList<>();
+	}
 }

hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/vo/ExceedVo.java

@@ -0,0 +1,26 @@
+package com.hnac.hzims.spare.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author ysj
+ */
+@Data
+public class ExceedVo {
+
+    @ApiModelProperty(value = "机构名称")
+    private String deptName;
+
+    @ApiModelProperty(value = "事件Id")
+    private String eventId;
+
+    @ApiModelProperty(value = "事件内容")
+    private String content;
+
+    @ApiModelProperty(value = "事件time")
+    private String time;
+
+    @ApiModelProperty(value = "提醒数量")
+    private Integer sum;
+}

hzims-service-api/base-info-api/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.hnac.hzims</groupId>
+        <artifactId>hzims-service-api</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
+    </parent>
+
+
+    <artifactId>base-info-api</artifactId>
+    <version>${hzims.project.version}</version>
+    <packaging>jar</packaging>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/FileReservoirInfo.java

@@ -0,0 +1,65 @@
+package com.hnac.hzims.baseinfo.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 文件
+ *
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/8 16:01
+ */
+@Data
+@Accessors(chain = true)
+@TableName("file_reservoir_info")
+public class FileReservoirInfo implements Serializable {
+
+
+    /**
+     * 视频Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+
+    /**
+     * '视频地址'
+     */
+    private String file;
+
+
+    /**
+     * 站点Id
+     */
+    private String reservoirInfoId;
+
+
+
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 逻辑删除0 正常 1 删除
+     */
+    @TableLogic
+    private int isDeleted;
+}

hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ImageReservoirInfo.java

@@ -0,0 +1,62 @@
+package com.hnac.hzims.baseinfo.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 文件
+ *
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/8 16:01
+ */
+@Data
+@Accessors(chain = true)
+@TableName("image_reservoir_info")
+public class ImageReservoirInfo implements Serializable {
+
+
+    /**
+     * 视频Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+
+    /**
+     * '视频地址'
+     */
+    private String image;
+
+
+    /**
+     * 站点Id
+     */
+    private String reservoirInfoId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 逻辑删除0 正常 1 删除
+     */
+    @TableLogic
+    private int isDeleted;
+}

hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/IrrBIReach.java

@@ -0,0 +1,62 @@
+package com.hnac.hzims.baseinfo.entity;
+
+import java.math.BigDecimal;
+
+/**
+ * 河流 <国标>
+ * 
+ * @author moze
+ *
+ */
+public class IrrBIReach {
+	private String riverCode; // 河流代码
+
+	private String riverName; // 河流名称
+
+	private BigDecimal riverWidth; // 河槽平均宽度(米)
+
+	private BigDecimal riverFlux; // 河槽平均流量（立方米/秒）
+
+	private String coordinateset; // 经纬集合
+
+	public String getCoordinateset() {
+		return coordinateset;
+	}
+
+	public void setCoordinateset(String coordinateset) {
+		this.coordinateset = coordinateset;
+	}
+
+	public String getRiverCode() {
+		return riverCode;
+	}
+
+	public void setRiverCode(String riverCode) {
+		this.riverCode = riverCode;
+	}
+
+	public String getRiverName() {
+		return riverName;
+	}
+
+	public void setRiverName(String riverName) {
+		this.riverName = riverName;
+	}
+
+	public BigDecimal getRiverWidth() {
+		return riverWidth;
+	}
+
+	public void setRiverWidth(BigDecimal riverWidth) {
+		this.riverWidth = riverWidth;
+	}
+
+	public BigDecimal getRiverFlux() {
+		return riverFlux;
+	}
+
+	public void setRiverFlux(BigDecimal riverFlux) {
+		this.riverFlux = riverFlux;
+	}
+
+}

hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/IrrBIReachExample.java

@@ -0,0 +1,531 @@
+package com.hnac.hzims.baseinfo.entity;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+public class IrrBIReachExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public IrrBIReachExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andRiverCodeIsNull() {
+            addCriterion("RIVER_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverCodeIsNotNull() {
+            addCriterion("RIVER_CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverCodeEqualTo(String value) {
+            addCriterion("RIVER_CODE =", value, "riverCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverCodeNotEqualTo(String value) {
+            addCriterion("RIVER_CODE <>", value, "riverCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverCodeGreaterThan(String value) {
+            addCriterion("RIVER_CODE >", value, "riverCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("RIVER_CODE >=", value, "riverCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverCodeLessThan(String value) {
+            addCriterion("RIVER_CODE <", value, "riverCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverCodeLessThanOrEqualTo(String value) {
+            addCriterion("RIVER_CODE <=", value, "riverCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverCodeLike(String value) {
+            addCriterion("RIVER_CODE like", value, "riverCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverCodeNotLike(String value) {
+            addCriterion("RIVER_CODE not like", value, "riverCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverCodeIn(List<String> values) {
+            addCriterion("RIVER_CODE in", values, "riverCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverCodeNotIn(List<String> values) {
+            addCriterion("RIVER_CODE not in", values, "riverCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverCodeBetween(String value1, String value2) {
+            addCriterion("RIVER_CODE between", value1, value2, "riverCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverCodeNotBetween(String value1, String value2) {
+            addCriterion("RIVER_CODE not between", value1, value2, "riverCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverNameIsNull() {
+            addCriterion("RIVER_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverNameIsNotNull() {
+            addCriterion("RIVER_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverNameEqualTo(String value) {
+            addCriterion("RIVER_NAME =", value, "riverName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverNameNotEqualTo(String value) {
+            addCriterion("RIVER_NAME <>", value, "riverName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverNameGreaterThan(String value) {
+            addCriterion("RIVER_NAME >", value, "riverName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverNameGreaterThanOrEqualTo(String value) {
+            addCriterion("RIVER_NAME >=", value, "riverName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverNameLessThan(String value) {
+            addCriterion("RIVER_NAME <", value, "riverName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverNameLessThanOrEqualTo(String value) {
+            addCriterion("RIVER_NAME <=", value, "riverName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverNameLike(String value) {
+            addCriterion("RIVER_NAME like", value, "riverName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverNameNotLike(String value) {
+            addCriterion("RIVER_NAME not like", value, "riverName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverNameIn(List<String> values) {
+            addCriterion("RIVER_NAME in", values, "riverName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverNameNotIn(List<String> values) {
+            addCriterion("RIVER_NAME not in", values, "riverName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverNameBetween(String value1, String value2) {
+            addCriterion("RIVER_NAME between", value1, value2, "riverName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverNameNotBetween(String value1, String value2) {
+            addCriterion("RIVER_NAME not between", value1, value2, "riverName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverWidthIsNull() {
+            addCriterion("RIVER_WIDTH is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverWidthIsNotNull() {
+            addCriterion("RIVER_WIDTH is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverWidthEqualTo(BigDecimal value) {
+            addCriterion("RIVER_WIDTH =", value, "riverWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverWidthNotEqualTo(BigDecimal value) {
+            addCriterion("RIVER_WIDTH <>", value, "riverWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverWidthGreaterThan(BigDecimal value) {
+            addCriterion("RIVER_WIDTH >", value, "riverWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverWidthGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("RIVER_WIDTH >=", value, "riverWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverWidthLessThan(BigDecimal value) {
+            addCriterion("RIVER_WIDTH <", value, "riverWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverWidthLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("RIVER_WIDTH <=", value, "riverWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverWidthIn(List<BigDecimal> values) {
+            addCriterion("RIVER_WIDTH in", values, "riverWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverWidthNotIn(List<BigDecimal> values) {
+            addCriterion("RIVER_WIDTH not in", values, "riverWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverWidthBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("RIVER_WIDTH between", value1, value2, "riverWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverWidthNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("RIVER_WIDTH not between", value1, value2, "riverWidth");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverFluxIsNull() {
+            addCriterion("RIVER_FLUX is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverFluxIsNotNull() {
+            addCriterion("RIVER_FLUX is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverFluxEqualTo(BigDecimal value) {
+            addCriterion("RIVER_FLUX =", value, "riverFlux");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverFluxNotEqualTo(BigDecimal value) {
+            addCriterion("RIVER_FLUX <>", value, "riverFlux");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverFluxGreaterThan(BigDecimal value) {
+            addCriterion("RIVER_FLUX >", value, "riverFlux");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverFluxGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("RIVER_FLUX >=", value, "riverFlux");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverFluxLessThan(BigDecimal value) {
+            addCriterion("RIVER_FLUX <", value, "riverFlux");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverFluxLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("RIVER_FLUX <=", value, "riverFlux");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverFluxIn(List<BigDecimal> values) {
+            addCriterion("RIVER_FLUX in", values, "riverFlux");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverFluxNotIn(List<BigDecimal> values) {
+            addCriterion("RIVER_FLUX not in", values, "riverFlux");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverFluxBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("RIVER_FLUX between", value1, value2, "riverFlux");
+            return (Criteria) this;
+        }
+
+        public Criteria andRiverFluxNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("RIVER_FLUX not between", value1, value2, "riverFlux");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetIsNull() {
+            addCriterion("COORDINATESET is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetIsNotNull() {
+            addCriterion("COORDINATESET is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetEqualTo(String value) {
+            addCriterion("COORDINATESET =", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetNotEqualTo(String value) {
+            addCriterion("COORDINATESET <>", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetGreaterThan(String value) {
+            addCriterion("COORDINATESET >", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetGreaterThanOrEqualTo(String value) {
+            addCriterion("COORDINATESET >=", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetLessThan(String value) {
+            addCriterion("COORDINATESET <", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetLessThanOrEqualTo(String value) {
+            addCriterion("COORDINATESET <=", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetLike(String value) {
+            addCriterion("COORDINATESET like", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetNotLike(String value) {
+            addCriterion("COORDINATESET not like", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetIn(List<String> values) {
+            addCriterion("COORDINATESET in", values, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetNotIn(List<String> values) {
+            addCriterion("COORDINATESET not in", values, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetBetween(String value1, String value2) {
+            addCriterion("COORDINATESET between", value1, value2, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetNotBetween(String value1, String value2) {
+            addCriterion("COORDINATESET not between", value1, value2, "coordinateset");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirInfo.java

@@ -0,0 +1,408 @@
+package com.hnac.hzims.baseinfo.entity;
+
+
+
+import com.hnac.hzims.baseinfo.vo.ReservoirInfoVo;
+
+import java.util.Date;
+
+/**
+ * 水库基本信息表 《参照国标自行设计》
+ * 
+ * @author moze
+ *
+ */
+public class ReservoirInfo {
+	private String stcd; // 水库编号
+
+	private String stationid; // 站点ID
+
+	private Float discharge; // 水库核定下泄流量 m³/s
+
+	private String name; // 水库名称
+
+	private String location; // 水库地址
+
+	private String village; // 所在乡镇村
+
+	private Float roadlength; // 防汛公路长度 m
+
+	private String roadconditiion;// 防汛公路状况
+
+	private Date builddate;// 建设时间
+
+	private Date completeddate;// 竣工时间
+
+	private Float rainarea;// 积雨面积km²
+
+	private Float designedfloodflow;// 设计洪水流量m³/s
+
+	private Float chedkedfloodflow;// 校核洪水流量m³/s
+
+	private Float designedfillarea;// 设计灌面km²
+
+	private Float designedtotalflow;// 设计洪水总量 万m³
+
+	private Float checdedtotalflow;// 校核洪水总量 万m³
+
+	private Float averagerainfall;// 平均降雨量 mm
+
+	private Float designedmaxflow;// 设计最大泄量 m³/s
+
+	private Float checkedmaxflow;// 校核最大泄量m³/s
+
+	private Float volume;// 总库容 万m³
+
+	private Float checkedfloodlevel;// 校核洪水位
+
+	private Float historicalmaxlevel;// 历史最高水位
+
+	private Float floodcontrolvolume;// 防洪库容 万m³
+
+	private Float designedfloodlevel; // 设计洪水位 m
+
+	private Date maxleveltime; // 最高水位发生时间
+
+	private Float utilizablevolume; // 兴利库容万m³
+
+	private Float norrmallevel; // 正常蓄水位 m
+
+	private Float flooddetentionvolume; // 滞洪库容 万m³
+
+	private Float deadlevel; // 死水位 m
+
+	private String areaCode; // 行政区划Code
+
+	private String lrcd; // 湖库代码
+
+	private String szhldm; // 所在河流代码
+
+	private Float dongj; // 东经
+
+	private Float beiw; // 北纬
+
+	private Float mjflsscnwl; //主汛期限制水位
+
+	public Float getMjflsscnwl() {
+		return mjflsscnwl;
+	}
+
+	public void setMjflsscnwl(Float mjflsscnwl) {
+		this.mjflsscnwl = mjflsscnwl;
+	}
+
+	public String getAreaCode() {
+		return areaCode;
+	}
+
+	public void setAreaCode(String areaCode) {
+		this.areaCode = areaCode;
+	}
+
+	public String getLrcd() {
+		return lrcd;
+	}
+
+	public void setLrcd(String lrcd) {
+		this.lrcd = lrcd;
+	}
+
+	public String getSzhldm() {
+		return szhldm;
+	}
+
+	public void setSzhldm(String szhldm) {
+		this.szhldm = szhldm;
+	}
+
+	public Float getDongj() {
+		return dongj;
+	}
+
+	public void setDongj(Float dongj) {
+		this.dongj = dongj;
+	}
+
+	public Float getBeiw() {
+		return beiw;
+	}
+
+	public void setBeiw(Float beiw) {
+		this.beiw = beiw;
+	}
+
+	public ReservoirInfo() {
+	}
+
+	public ReservoirInfo(ReservoirInfoVo vo) {
+		this.averagerainfall = vo.getAveragerainfall();
+		this.builddate = vo.getBuilddate();
+		this.checdedtotalflow = vo.getChecdedtotalflow();
+		this.checkedfloodlevel = vo.getCheckedfloodlevel();
+		this.checkedmaxflow = vo.getCheckedmaxflow();
+		this.chedkedfloodflow = vo.getChedkedfloodflow();
+		this.completeddate = vo.getCompleteddate();
+		this.deadlevel = vo.getDeadlevel();
+		this.designedfillarea = vo.getDesignedfillarea();
+		this.designedfloodflow = vo.getDesignedfloodflow();
+		this.designedfloodlevel = vo.getDesignedfloodlevel();
+		this.designedmaxflow = vo.getDesignedmaxflow();
+		this.designedtotalflow = vo.getDesignedtotalflow();
+		this.discharge = vo.getDischarge();
+		this.floodcontrolvolume = vo.getFloodcontrolvolume();
+		this.flooddetentionvolume = vo.getFlooddetentionvolume();
+		this.historicalmaxlevel = vo.getHistoricalmaxlevel();
+		this.location = vo.getLocation();
+		this.maxleveltime = vo.getMaxleveltime();
+		this.name = vo.getName();
+		this.norrmallevel = vo.getNorrmallevel();
+		this.rainarea = vo.getRainarea();
+		this.roadconditiion = vo.getRoadconditiion();
+		this.roadlength = vo.getRoadlength();
+		this.stationid = vo.getStationid();
+		this.stcd = vo.getStcd();
+		this.utilizablevolume = vo.getUtilizablevolume();
+		this.village = vo.getVillage();
+		this.volume = vo.getVolume();
+		this.areaCode = vo.getAreaCode();
+		this.beiw = vo.getBeiw();
+		this.dongj = vo.getDongj();
+		this.lrcd = vo.getLrcd();
+		this.szhldm = vo.getSzhldm();
+		this.areaCode = vo.getAreaCode();
+		this.mjflsscnwl = vo.getMjflsscnwl();
+	}
+
+	public String getStcd() {
+		return stcd;
+	}
+
+	public void setStcd(String stcd) {
+		this.stcd = stcd;
+	}
+
+	public String getStationid() {
+		return stationid;
+	}
+
+	public void setStationid(String stationid) {
+		this.stationid = stationid;
+	}
+
+	public Float getDischarge() {
+		return discharge;
+	}
+
+	public void setDischarge(Float discharge) {
+		this.discharge = discharge;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getLocation() {
+		return location;
+	}
+
+	public void setLocation(String location) {
+		this.location = location;
+	}
+
+	public String getVillage() {
+		return village;
+	}
+
+	public void setVillage(String village) {
+		this.village = village;
+	}
+
+	public Float getRoadlength() {
+		return roadlength;
+	}
+
+	public void setRoadlength(Float roadlength) {
+		this.roadlength = roadlength;
+	}
+
+	public String getRoadconditiion() {
+		return roadconditiion;
+	}
+
+	public void setRoadconditiion(String roadconditiion) {
+		this.roadconditiion = roadconditiion;
+	}
+
+	public Date getBuilddate() {
+		return builddate;
+	}
+
+	public void setBuilddate(Date builddate) {
+		this.builddate = builddate;
+	}
+
+	public Date getCompleteddate() {
+		return completeddate;
+	}
+
+	public void setCompleteddate(Date completeddate) {
+		this.completeddate = completeddate;
+	}
+
+	public Float getRainarea() {
+		return rainarea;
+	}
+
+	public void setRainarea(Float rainarea) {
+		this.rainarea = rainarea;
+	}
+
+	public Float getDesignedfloodflow() {
+		return designedfloodflow;
+	}
+
+	public void setDesignedfloodflow(Float designedfloodflow) {
+		this.designedfloodflow = designedfloodflow;
+	}
+
+	public Float getChedkedfloodflow() {
+		return chedkedfloodflow;
+	}
+
+	public void setChedkedfloodflow(Float chedkedfloodflow) {
+		this.chedkedfloodflow = chedkedfloodflow;
+	}
+
+	public Float getDesignedfillarea() {
+		return designedfillarea;
+	}
+
+	public void setDesignedfillarea(Float designedfillarea) {
+		this.designedfillarea = designedfillarea;
+	}
+
+	public Float getDesignedtotalflow() {
+		return designedtotalflow;
+	}
+
+	public void setDesignedtotalflow(Float designedtotalflow) {
+		this.designedtotalflow = designedtotalflow;
+	}
+
+	public Float getChecdedtotalflow() {
+		return checdedtotalflow;
+	}
+
+	public void setChecdedtotalflow(Float checdedtotalflow) {
+		this.checdedtotalflow = checdedtotalflow;
+	}
+
+	public Float getAveragerainfall() {
+		return averagerainfall;
+	}
+
+	public void setAveragerainfall(Float averagerainfall) {
+		this.averagerainfall = averagerainfall;
+	}
+
+	public Float getDesignedmaxflow() {
+		return designedmaxflow;
+	}
+
+	public void setDesignedmaxflow(Float designedmaxflow) {
+		this.designedmaxflow = designedmaxflow;
+	}
+
+	public Float getCheckedmaxflow() {
+		return checkedmaxflow;
+	}
+
+	public void setCheckedmaxflow(Float checkedmaxflow) {
+		this.checkedmaxflow = checkedmaxflow;
+	}
+
+	public Float getVolume() {
+		return volume;
+	}
+
+	public void setVolume(Float volume) {
+		this.volume = volume;
+	}
+
+	public Float getCheckedfloodlevel() {
+		return checkedfloodlevel;
+	}
+
+	public void setCheckedfloodlevel(Float checkedfloodlevel) {
+		this.checkedfloodlevel = checkedfloodlevel;
+	}
+
+	public Float getHistoricalmaxlevel() {
+		return historicalmaxlevel;
+	}
+
+	public void setHistoricalmaxlevel(Float historicalmaxlevel) {
+		this.historicalmaxlevel = historicalmaxlevel;
+	}
+
+	public Float getFloodcontrolvolume() {
+		return floodcontrolvolume;
+	}
+
+	public void setFloodcontrolvolume(Float floodcontrolvolume) {
+		this.floodcontrolvolume = floodcontrolvolume;
+	}
+
+	public Float getDesignedfloodlevel() {
+		return designedfloodlevel;
+	}
+
+	public void setDesignedfloodlevel(Float designedfloodlevel) {
+		this.designedfloodlevel = designedfloodlevel;
+	}
+
+	public Date getMaxleveltime() {
+		return maxleveltime;
+	}
+
+	public void setMaxleveltime(Date maxleveltime) {
+		this.maxleveltime = maxleveltime;
+	}
+
+	public Float getUtilizablevolume() {
+		return utilizablevolume;
+	}
+
+	public void setUtilizablevolume(Float utilizablevolume) {
+		this.utilizablevolume = utilizablevolume;
+	}
+
+	public Float getNorrmallevel() {
+		return norrmallevel;
+	}
+
+	public void setNorrmallevel(Float norrmallevel) {
+		this.norrmallevel = norrmallevel;
+	}
+
+	public Float getFlooddetentionvolume() {
+		return flooddetentionvolume;
+	}
+
+	public void setFlooddetentionvolume(Float flooddetentionvolume) {
+		this.flooddetentionvolume = flooddetentionvolume;
+	}
+
+	public Float getDeadlevel() {
+		return deadlevel;
+	}
+
+	public void setDeadlevel(Float deadlevel) {
+		this.deadlevel = deadlevel;
+	}
+
+}

hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirRefdata.java

@@ -0,0 +1,50 @@
+package com.hnac.hzims.baseinfo.entity;
+
+/**
+ * 水库数据扩展表
+ * 
+ * @author moze
+ *
+ */
+public class ReservoirRefdata {
+	private String stcd; // 水库编号
+
+	private String refstcd; // 关联测站
+
+	private String refqpoint; // 关联流量数据点
+
+	private String refzpoint; // 关联水位数据点
+
+	public String getStcd() {
+		return stcd;
+	}
+
+	public void setStcd(String stcd) {
+		this.stcd = stcd;
+	}
+
+	public String getRefstcd() {
+		return refstcd;
+	}
+
+	public void setRefstcd(String refstcd) {
+		this.refstcd = refstcd;
+	}
+
+	public String getRefqpoint() {
+		return refqpoint;
+	}
+
+	public void setRefqpoint(String refqpoint) {
+		this.refqpoint = refqpoint;
+	}
+
+	public String getRefzpoint() {
+		return refzpoint;
+	}
+
+	public void setRefzpoint(String refzpoint) {
+		this.refzpoint = refzpoint;
+	}
+
+}

hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirRefdataExample.java

@@ -0,0 +1,480 @@
+package com.hnac.hzims.baseinfo.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ReservoirRefdataExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public ReservoirRefdataExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andStcdIsNull() {
+            addCriterion("STCD is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdIsNotNull() {
+            addCriterion("STCD is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdEqualTo(String value) {
+            addCriterion("STCD =", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdNotEqualTo(String value) {
+            addCriterion("STCD <>", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdGreaterThan(String value) {
+            addCriterion("STCD >", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdGreaterThanOrEqualTo(String value) {
+            addCriterion("STCD >=", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdLessThan(String value) {
+            addCriterion("STCD <", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdLessThanOrEqualTo(String value) {
+            addCriterion("STCD <=", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdLike(String value) {
+            addCriterion("STCD like", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdNotLike(String value) {
+            addCriterion("STCD not like", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdIn(List<String> values) {
+            addCriterion("STCD in", values, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdNotIn(List<String> values) {
+            addCriterion("STCD not in", values, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdBetween(String value1, String value2) {
+            addCriterion("STCD between", value1, value2, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdNotBetween(String value1, String value2) {
+            addCriterion("STCD not between", value1, value2, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefstcdIsNull() {
+            addCriterion("REFSTCD is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefstcdIsNotNull() {
+            addCriterion("REFSTCD is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefstcdEqualTo(String value) {
+            addCriterion("REFSTCD =", value, "refstcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefstcdNotEqualTo(String value) {
+            addCriterion("REFSTCD <>", value, "refstcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefstcdGreaterThan(String value) {
+            addCriterion("REFSTCD >", value, "refstcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefstcdGreaterThanOrEqualTo(String value) {
+            addCriterion("REFSTCD >=", value, "refstcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefstcdLessThan(String value) {
+            addCriterion("REFSTCD <", value, "refstcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefstcdLessThanOrEqualTo(String value) {
+            addCriterion("REFSTCD <=", value, "refstcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefstcdLike(String value) {
+            addCriterion("REFSTCD like", value, "refstcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefstcdNotLike(String value) {
+            addCriterion("REFSTCD not like", value, "refstcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefstcdIn(List<String> values) {
+            addCriterion("REFSTCD in", values, "refstcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefstcdNotIn(List<String> values) {
+            addCriterion("REFSTCD not in", values, "refstcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefstcdBetween(String value1, String value2) {
+            addCriterion("REFSTCD between", value1, value2, "refstcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefstcdNotBetween(String value1, String value2) {
+            addCriterion("REFSTCD not between", value1, value2, "refstcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefqpointIsNull() {
+            addCriterion("REFQPOINT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefqpointIsNotNull() {
+            addCriterion("REFQPOINT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefqpointEqualTo(String value) {
+            addCriterion("REFQPOINT =", value, "refqpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefqpointNotEqualTo(String value) {
+            addCriterion("REFQPOINT <>", value, "refqpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefqpointGreaterThan(String value) {
+            addCriterion("REFQPOINT >", value, "refqpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefqpointGreaterThanOrEqualTo(String value) {
+            addCriterion("REFQPOINT >=", value, "refqpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefqpointLessThan(String value) {
+            addCriterion("REFQPOINT <", value, "refqpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefqpointLessThanOrEqualTo(String value) {
+            addCriterion("REFQPOINT <=", value, "refqpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefqpointLike(String value) {
+            addCriterion("REFQPOINT like", value, "refqpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefqpointNotLike(String value) {
+            addCriterion("REFQPOINT not like", value, "refqpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefqpointIn(List<String> values) {
+            addCriterion("REFQPOINT in", values, "refqpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefqpointNotIn(List<String> values) {
+            addCriterion("REFQPOINT not in", values, "refqpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefqpointBetween(String value1, String value2) {
+            addCriterion("REFQPOINT between", value1, value2, "refqpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefqpointNotBetween(String value1, String value2) {
+            addCriterion("REFQPOINT not between", value1, value2, "refqpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefzpointIsNull() {
+            addCriterion("REFZPOINT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefzpointIsNotNull() {
+            addCriterion("REFZPOINT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefzpointEqualTo(String value) {
+            addCriterion("REFZPOINT =", value, "refzpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefzpointNotEqualTo(String value) {
+            addCriterion("REFZPOINT <>", value, "refzpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefzpointGreaterThan(String value) {
+            addCriterion("REFZPOINT >", value, "refzpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefzpointGreaterThanOrEqualTo(String value) {
+            addCriterion("REFZPOINT >=", value, "refzpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefzpointLessThan(String value) {
+            addCriterion("REFZPOINT <", value, "refzpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefzpointLessThanOrEqualTo(String value) {
+            addCriterion("REFZPOINT <=", value, "refzpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefzpointLike(String value) {
+            addCriterion("REFZPOINT like", value, "refzpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefzpointNotLike(String value) {
+            addCriterion("REFZPOINT not like", value, "refzpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefzpointIn(List<String> values) {
+            addCriterion("REFZPOINT in", values, "refzpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefzpointNotIn(List<String> values) {
+            addCriterion("REFZPOINT not in", values, "refzpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefzpointBetween(String value1, String value2) {
+            addCriterion("REFZPOINT between", value1, value2, "refzpoint");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefzpointNotBetween(String value1, String value2) {
+            addCriterion("REFZPOINT not between", value1, value2, "refzpoint");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirWaterManage.java

@@ -0,0 +1,95 @@
+package com.hnac.hzims.baseinfo.entity;
+
+import java.math.BigDecimal;
+
+public class ReservoirWaterManage {
+    private Integer id;
+
+    private Integer month;
+
+    private BigDecimal firstArea;
+
+    private BigDecimal secondArea;
+
+    private BigDecimal thirdArea;
+
+    private BigDecimal fourthArea;
+
+    private BigDecimal fivthArea;
+
+    private BigDecimal sixthArea;
+
+    private String stcd;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getMonth() {
+        return month;
+    }
+
+    public void setMonth(Integer month) {
+        this.month = month;
+    }
+
+    public BigDecimal getFirstArea() {
+        return firstArea;
+    }
+
+    public void setFirstArea(BigDecimal firstArea) {
+        this.firstArea = firstArea;
+    }
+
+    public BigDecimal getSecondArea() {
+        return secondArea;
+    }
+
+    public void setSecondArea(BigDecimal secondArea) {
+        this.secondArea = secondArea;
+    }
+
+    public BigDecimal getThirdArea() {
+        return thirdArea;
+    }
+
+    public void setThirdArea(BigDecimal thirdArea) {
+        this.thirdArea = thirdArea;
+    }
+
+    public BigDecimal getFourthArea() {
+        return fourthArea;
+    }
+
+    public void setFourthArea(BigDecimal fourthArea) {
+        this.fourthArea = fourthArea;
+    }
+
+    public BigDecimal getFivthArea() {
+        return fivthArea;
+    }
+
+    public void setFivthArea(BigDecimal fivthArea) {
+        this.fivthArea = fivthArea;
+    }
+
+    public BigDecimal getSixthArea() {
+        return sixthArea;
+    }
+
+    public void setSixthArea(BigDecimal sixthArea) {
+        this.sixthArea = sixthArea;
+    }
+
+    public String getStcd() {
+        return stcd;
+    }
+
+    public void setStcd(String stcd) {
+        this.stcd = stcd;
+    }
+}

hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirWaterManageExample.java

@@ -0,0 +1,751 @@
+package com.hnac.hzims.baseinfo.entity;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ReservoirWaterManageExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public ReservoirWaterManageExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthIsNull() {
+            addCriterion("MONTH is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthIsNotNull() {
+            addCriterion("MONTH is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthEqualTo(Integer value) {
+            addCriterion("MONTH =", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthNotEqualTo(Integer value) {
+            addCriterion("MONTH <>", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthGreaterThan(Integer value) {
+            addCriterion("MONTH >", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthGreaterThanOrEqualTo(Integer value) {
+            addCriterion("MONTH >=", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthLessThan(Integer value) {
+            addCriterion("MONTH <", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthLessThanOrEqualTo(Integer value) {
+            addCriterion("MONTH <=", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthIn(List<Integer> values) {
+            addCriterion("MONTH in", values, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthNotIn(List<Integer> values) {
+            addCriterion("MONTH not in", values, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthBetween(Integer value1, Integer value2) {
+            addCriterion("MONTH between", value1, value2, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthNotBetween(Integer value1, Integer value2) {
+            addCriterion("MONTH not between", value1, value2, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstAreaIsNull() {
+            addCriterion("FIRST_AREA is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstAreaIsNotNull() {
+            addCriterion("FIRST_AREA is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstAreaEqualTo(BigDecimal value) {
+            addCriterion("FIRST_AREA =", value, "firstArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstAreaNotEqualTo(BigDecimal value) {
+            addCriterion("FIRST_AREA <>", value, "firstArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstAreaGreaterThan(BigDecimal value) {
+            addCriterion("FIRST_AREA >", value, "firstArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstAreaGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("FIRST_AREA >=", value, "firstArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstAreaLessThan(BigDecimal value) {
+            addCriterion("FIRST_AREA <", value, "firstArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstAreaLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("FIRST_AREA <=", value, "firstArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstAreaIn(List<BigDecimal> values) {
+            addCriterion("FIRST_AREA in", values, "firstArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstAreaNotIn(List<BigDecimal> values) {
+            addCriterion("FIRST_AREA not in", values, "firstArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstAreaBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("FIRST_AREA between", value1, value2, "firstArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstAreaNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("FIRST_AREA not between", value1, value2, "firstArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondAreaIsNull() {
+            addCriterion("SECOND_AREA is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondAreaIsNotNull() {
+            addCriterion("SECOND_AREA is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondAreaEqualTo(BigDecimal value) {
+            addCriterion("SECOND_AREA =", value, "secondArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondAreaNotEqualTo(BigDecimal value) {
+            addCriterion("SECOND_AREA <>", value, "secondArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondAreaGreaterThan(BigDecimal value) {
+            addCriterion("SECOND_AREA >", value, "secondArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondAreaGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("SECOND_AREA >=", value, "secondArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondAreaLessThan(BigDecimal value) {
+            addCriterion("SECOND_AREA <", value, "secondArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondAreaLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("SECOND_AREA <=", value, "secondArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondAreaIn(List<BigDecimal> values) {
+            addCriterion("SECOND_AREA in", values, "secondArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondAreaNotIn(List<BigDecimal> values) {
+            addCriterion("SECOND_AREA not in", values, "secondArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondAreaBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("SECOND_AREA between", value1, value2, "secondArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondAreaNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("SECOND_AREA not between", value1, value2, "secondArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdAreaIsNull() {
+            addCriterion("THIRD_AREA is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdAreaIsNotNull() {
+            addCriterion("THIRD_AREA is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdAreaEqualTo(BigDecimal value) {
+            addCriterion("THIRD_AREA =", value, "thirdArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdAreaNotEqualTo(BigDecimal value) {
+            addCriterion("THIRD_AREA <>", value, "thirdArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdAreaGreaterThan(BigDecimal value) {
+            addCriterion("THIRD_AREA >", value, "thirdArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdAreaGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("THIRD_AREA >=", value, "thirdArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdAreaLessThan(BigDecimal value) {
+            addCriterion("THIRD_AREA <", value, "thirdArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdAreaLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("THIRD_AREA <=", value, "thirdArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdAreaIn(List<BigDecimal> values) {
+            addCriterion("THIRD_AREA in", values, "thirdArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdAreaNotIn(List<BigDecimal> values) {
+            addCriterion("THIRD_AREA not in", values, "thirdArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdAreaBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("THIRD_AREA between", value1, value2, "thirdArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdAreaNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("THIRD_AREA not between", value1, value2, "thirdArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFourthAreaIsNull() {
+            addCriterion("FOURTH_AREA is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFourthAreaIsNotNull() {
+            addCriterion("FOURTH_AREA is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFourthAreaEqualTo(BigDecimal value) {
+            addCriterion("FOURTH_AREA =", value, "fourthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFourthAreaNotEqualTo(BigDecimal value) {
+            addCriterion("FOURTH_AREA <>", value, "fourthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFourthAreaGreaterThan(BigDecimal value) {
+            addCriterion("FOURTH_AREA >", value, "fourthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFourthAreaGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("FOURTH_AREA >=", value, "fourthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFourthAreaLessThan(BigDecimal value) {
+            addCriterion("FOURTH_AREA <", value, "fourthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFourthAreaLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("FOURTH_AREA <=", value, "fourthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFourthAreaIn(List<BigDecimal> values) {
+            addCriterion("FOURTH_AREA in", values, "fourthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFourthAreaNotIn(List<BigDecimal> values) {
+            addCriterion("FOURTH_AREA not in", values, "fourthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFourthAreaBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("FOURTH_AREA between", value1, value2, "fourthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFourthAreaNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("FOURTH_AREA not between", value1, value2, "fourthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFivthAreaIsNull() {
+            addCriterion("FIVTH_AREA is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFivthAreaIsNotNull() {
+            addCriterion("FIVTH_AREA is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFivthAreaEqualTo(BigDecimal value) {
+            addCriterion("FIVTH_AREA =", value, "fivthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFivthAreaNotEqualTo(BigDecimal value) {
+            addCriterion("FIVTH_AREA <>", value, "fivthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFivthAreaGreaterThan(BigDecimal value) {
+            addCriterion("FIVTH_AREA >", value, "fivthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFivthAreaGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("FIVTH_AREA >=", value, "fivthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFivthAreaLessThan(BigDecimal value) {
+            addCriterion("FIVTH_AREA <", value, "fivthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFivthAreaLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("FIVTH_AREA <=", value, "fivthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFivthAreaIn(List<BigDecimal> values) {
+            addCriterion("FIVTH_AREA in", values, "fivthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFivthAreaNotIn(List<BigDecimal> values) {
+            addCriterion("FIVTH_AREA not in", values, "fivthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFivthAreaBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("FIVTH_AREA between", value1, value2, "fivthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFivthAreaNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("FIVTH_AREA not between", value1, value2, "fivthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSixthAreaIsNull() {
+            addCriterion("SIXTH_AREA is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSixthAreaIsNotNull() {
+            addCriterion("SIXTH_AREA is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSixthAreaEqualTo(BigDecimal value) {
+            addCriterion("SIXTH_AREA =", value, "sixthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSixthAreaNotEqualTo(BigDecimal value) {
+            addCriterion("SIXTH_AREA <>", value, "sixthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSixthAreaGreaterThan(BigDecimal value) {
+            addCriterion("SIXTH_AREA >", value, "sixthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSixthAreaGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("SIXTH_AREA >=", value, "sixthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSixthAreaLessThan(BigDecimal value) {
+            addCriterion("SIXTH_AREA <", value, "sixthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSixthAreaLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("SIXTH_AREA <=", value, "sixthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSixthAreaIn(List<BigDecimal> values) {
+            addCriterion("SIXTH_AREA in", values, "sixthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSixthAreaNotIn(List<BigDecimal> values) {
+            addCriterion("SIXTH_AREA not in", values, "sixthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSixthAreaBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("SIXTH_AREA between", value1, value2, "sixthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSixthAreaNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("SIXTH_AREA not between", value1, value2, "sixthArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdIsNull() {
+            addCriterion("STCD is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdIsNotNull() {
+            addCriterion("STCD is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdEqualTo(String value) {
+            addCriterion("STCD =", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdNotEqualTo(String value) {
+            addCriterion("STCD <>", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdGreaterThan(String value) {
+            addCriterion("STCD >", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdGreaterThanOrEqualTo(String value) {
+            addCriterion("STCD >=", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdLessThan(String value) {
+            addCriterion("STCD <", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdLessThanOrEqualTo(String value) {
+            addCriterion("STCD <=", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdLike(String value) {
+            addCriterion("STCD like", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdNotLike(String value) {
+            addCriterion("STCD not like", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdIn(List<String> values) {
+            addCriterion("STCD in", values, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdNotIn(List<String> values) {
+            addCriterion("STCD not in", values, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdBetween(String value1, String value2) {
+            addCriterion("STCD between", value1, value2, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdNotBetween(String value1, String value2) {
+            addCriterion("STCD not between", value1, value2, "stcd");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/StZvarlB.java

@@ -0,0 +1,92 @@
+package com.hnac.hzims.baseinfo.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 库(湖)容曲线表
+ * 
+ * @author moze
+ *
+ */
+public class StZvarlB {
+	private Integer id;
+
+	private String stcd; // 水库编码
+
+	private Date mstm; // 施测时间
+
+	private Integer ptno; // 点序号
+
+	private BigDecimal rz; // 库水位
+
+	private BigDecimal w; // 蓄水量
+
+	private BigDecimal wsfa; // 水位面积
+
+	private Date moditime; // 时间戳
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getStcd() {
+		return stcd;
+	}
+
+	public void setStcd(String stcd) {
+		this.stcd = stcd;
+	}
+
+	public Date getMstm() {
+		return mstm;
+	}
+
+	public void setMstm(Date mstm) {
+		this.mstm = mstm;
+	}
+
+	public Integer getPtno() {
+		return ptno;
+	}
+
+	public void setPtno(Integer ptno) {
+		this.ptno = ptno;
+	}
+
+	public BigDecimal getRz() {
+		return rz;
+	}
+
+	public void setRz(BigDecimal rz) {
+		this.rz = rz;
+	}
+
+	public BigDecimal getW() {
+		return w;
+	}
+
+	public void setW(BigDecimal w) {
+		this.w = w;
+	}
+
+	public BigDecimal getWsfa() {
+		return wsfa;
+	}
+
+	public void setWsfa(BigDecimal wsfa) {
+		this.wsfa = wsfa;
+	}
+
+	public Date getModitime() {
+		return moditime;
+	}
+
+	public void setModitime(Date moditime) {
+		this.moditime = moditime;
+	}
+}

hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/StZvarlBExample.java

@@ -0,0 +1,692 @@
+package com.hnac.hzims.baseinfo.entity;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class StZvarlBExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public StZvarlBExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdIsNull() {
+            addCriterion("STCD is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdIsNotNull() {
+            addCriterion("STCD is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdEqualTo(String value) {
+            addCriterion("STCD =", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdNotEqualTo(String value) {
+            addCriterion("STCD <>", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdGreaterThan(String value) {
+            addCriterion("STCD >", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdGreaterThanOrEqualTo(String value) {
+            addCriterion("STCD >=", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdLessThan(String value) {
+            addCriterion("STCD <", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdLessThanOrEqualTo(String value) {
+            addCriterion("STCD <=", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdLike(String value) {
+            addCriterion("STCD like", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdNotLike(String value) {
+            addCriterion("STCD not like", value, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdIn(List<String> values) {
+            addCriterion("STCD in", values, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdNotIn(List<String> values) {
+            addCriterion("STCD not in", values, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdBetween(String value1, String value2) {
+            addCriterion("STCD between", value1, value2, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andStcdNotBetween(String value1, String value2) {
+            addCriterion("STCD not between", value1, value2, "stcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andMstmIsNull() {
+            addCriterion("MSTM is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMstmIsNotNull() {
+            addCriterion("MSTM is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMstmEqualTo(Date value) {
+            addCriterion("MSTM =", value, "mstm");
+            return (Criteria) this;
+        }
+
+        public Criteria andMstmNotEqualTo(Date value) {
+            addCriterion("MSTM <>", value, "mstm");
+            return (Criteria) this;
+        }
+
+        public Criteria andMstmGreaterThan(Date value) {
+            addCriterion("MSTM >", value, "mstm");
+            return (Criteria) this;
+        }
+
+        public Criteria andMstmGreaterThanOrEqualTo(Date value) {
+            addCriterion("MSTM >=", value, "mstm");
+            return (Criteria) this;
+        }
+
+        public Criteria andMstmLessThan(Date value) {
+            addCriterion("MSTM <", value, "mstm");
+            return (Criteria) this;
+        }
+
+        public Criteria andMstmLessThanOrEqualTo(Date value) {
+            addCriterion("MSTM <=", value, "mstm");
+            return (Criteria) this;
+        }
+
+        public Criteria andMstmIn(List<Date> values) {
+            addCriterion("MSTM in", values, "mstm");
+            return (Criteria) this;
+        }
+
+        public Criteria andMstmNotIn(List<Date> values) {
+            addCriterion("MSTM not in", values, "mstm");
+            return (Criteria) this;
+        }
+
+        public Criteria andMstmBetween(Date value1, Date value2) {
+            addCriterion("MSTM between", value1, value2, "mstm");
+            return (Criteria) this;
+        }
+
+        public Criteria andMstmNotBetween(Date value1, Date value2) {
+            addCriterion("MSTM not between", value1, value2, "mstm");
+            return (Criteria) this;
+        }
+
+        public Criteria andPtnoIsNull() {
+            addCriterion("PTNO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPtnoIsNotNull() {
+            addCriterion("PTNO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPtnoEqualTo(Integer value) {
+            addCriterion("PTNO =", value, "ptno");
+            return (Criteria) this;
+        }
+
+        public Criteria andPtnoNotEqualTo(Integer value) {
+            addCriterion("PTNO <>", value, "ptno");
+            return (Criteria) this;
+        }
+
+        public Criteria andPtnoGreaterThan(Integer value) {
+            addCriterion("PTNO >", value, "ptno");
+            return (Criteria) this;
+        }
+
+        public Criteria andPtnoGreaterThanOrEqualTo(Integer value) {
+            addCriterion("PTNO >=", value, "ptno");
+            return (Criteria) this;
+        }
+
+        public Criteria andPtnoLessThan(Integer value) {
+            addCriterion("PTNO <", value, "ptno");
+            return (Criteria) this;
+        }
+
+        public Criteria andPtnoLessThanOrEqualTo(Integer value) {
+            addCriterion("PTNO <=", value, "ptno");
+            return (Criteria) this;
+        }
+
+        public Criteria andPtnoIn(List<Integer> values) {
+            addCriterion("PTNO in", values, "ptno");
+            return (Criteria) this;
+        }
+
+        public Criteria andPtnoNotIn(List<Integer> values) {
+            addCriterion("PTNO not in", values, "ptno");
+            return (Criteria) this;
+        }
+
+        public Criteria andPtnoBetween(Integer value1, Integer value2) {
+            addCriterion("PTNO between", value1, value2, "ptno");
+            return (Criteria) this;
+        }
+
+        public Criteria andPtnoNotBetween(Integer value1, Integer value2) {
+            addCriterion("PTNO not between", value1, value2, "ptno");
+            return (Criteria) this;
+        }
+
+        public Criteria andRzIsNull() {
+            addCriterion("RZ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRzIsNotNull() {
+            addCriterion("RZ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRzEqualTo(BigDecimal value) {
+            addCriterion("RZ =", value, "rz");
+            return (Criteria) this;
+        }
+
+        public Criteria andRzNotEqualTo(BigDecimal value) {
+            addCriterion("RZ <>", value, "rz");
+            return (Criteria) this;
+        }
+
+        public Criteria andRzGreaterThan(BigDecimal value) {
+            addCriterion("RZ >", value, "rz");
+            return (Criteria) this;
+        }
+
+        public Criteria andRzGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("RZ >=", value, "rz");
+            return (Criteria) this;
+        }
+
+        public Criteria andRzLessThan(BigDecimal value) {
+            addCriterion("RZ <", value, "rz");
+            return (Criteria) this;
+        }
+
+        public Criteria andRzLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("RZ <=", value, "rz");
+            return (Criteria) this;
+        }
+
+        public Criteria andRzIn(List<BigDecimal> values) {
+            addCriterion("RZ in", values, "rz");
+            return (Criteria) this;
+        }
+
+        public Criteria andRzNotIn(List<BigDecimal> values) {
+            addCriterion("RZ not in", values, "rz");
+            return (Criteria) this;
+        }
+
+        public Criteria andRzBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("RZ between", value1, value2, "rz");
+            return (Criteria) this;
+        }
+
+        public Criteria andRzNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("RZ not between", value1, value2, "rz");
+            return (Criteria) this;
+        }
+
+        public Criteria andWIsNull() {
+            addCriterion("W is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWIsNotNull() {
+            addCriterion("W is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWEqualTo(BigDecimal value) {
+            addCriterion("W =", value, "w");
+            return (Criteria) this;
+        }
+
+        public Criteria andWNotEqualTo(BigDecimal value) {
+            addCriterion("W <>", value, "w");
+            return (Criteria) this;
+        }
+
+        public Criteria andWGreaterThan(BigDecimal value) {
+            addCriterion("W >", value, "w");
+            return (Criteria) this;
+        }
+
+        public Criteria andWGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("W >=", value, "w");
+            return (Criteria) this;
+        }
+
+        public Criteria andWLessThan(BigDecimal value) {
+            addCriterion("W <", value, "w");
+            return (Criteria) this;
+        }
+
+        public Criteria andWLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("W <=", value, "w");
+            return (Criteria) this;
+        }
+
+        public Criteria andWIn(List<BigDecimal> values) {
+            addCriterion("W in", values, "w");
+            return (Criteria) this;
+        }
+
+        public Criteria andWNotIn(List<BigDecimal> values) {
+            addCriterion("W not in", values, "w");
+            return (Criteria) this;
+        }
+
+        public Criteria andWBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("W between", value1, value2, "w");
+            return (Criteria) this;
+        }
+
+        public Criteria andWNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("W not between", value1, value2, "w");
+            return (Criteria) this;
+        }
+
+        public Criteria andWsfaIsNull() {
+            addCriterion("WSFA is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWsfaIsNotNull() {
+            addCriterion("WSFA is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWsfaEqualTo(Integer value) {
+            addCriterion("WSFA =", value, "wsfa");
+            return (Criteria) this;
+        }
+
+        public Criteria andWsfaNotEqualTo(Integer value) {
+            addCriterion("WSFA <>", value, "wsfa");
+            return (Criteria) this;
+        }
+
+        public Criteria andWsfaGreaterThan(Integer value) {
+            addCriterion("WSFA >", value, "wsfa");
+            return (Criteria) this;
+        }
+
+        public Criteria andWsfaGreaterThanOrEqualTo(Integer value) {
+            addCriterion("WSFA >=", value, "wsfa");
+            return (Criteria) this;
+        }
+
+        public Criteria andWsfaLessThan(Integer value) {
+            addCriterion("WSFA <", value, "wsfa");
+            return (Criteria) this;
+        }
+
+        public Criteria andWsfaLessThanOrEqualTo(Integer value) {
+            addCriterion("WSFA <=", value, "wsfa");
+            return (Criteria) this;
+        }
+
+        public Criteria andWsfaIn(List<Integer> values) {
+            addCriterion("WSFA in", values, "wsfa");
+            return (Criteria) this;
+        }
+
+        public Criteria andWsfaNotIn(List<Integer> values) {
+            addCriterion("WSFA not in", values, "wsfa");
+            return (Criteria) this;
+        }
+
+        public Criteria andWsfaBetween(Integer value1, Integer value2) {
+            addCriterion("WSFA between", value1, value2, "wsfa");
+            return (Criteria) this;
+        }
+
+        public Criteria andWsfaNotBetween(Integer value1, Integer value2) {
+            addCriterion("WSFA not between", value1, value2, "wsfa");
+            return (Criteria) this;
+        }
+
+        public Criteria andModitimeIsNull() {
+            addCriterion("MODITIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModitimeIsNotNull() {
+            addCriterion("MODITIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModitimeEqualTo(Date value) {
+            addCriterion("MODITIME =", value, "moditime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModitimeNotEqualTo(Date value) {
+            addCriterion("MODITIME <>", value, "moditime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModitimeGreaterThan(Date value) {
+            addCriterion("MODITIME >", value, "moditime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModitimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("MODITIME >=", value, "moditime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModitimeLessThan(Date value) {
+            addCriterion("MODITIME <", value, "moditime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModitimeLessThanOrEqualTo(Date value) {
+            addCriterion("MODITIME <=", value, "moditime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModitimeIn(List<Date> values) {
+            addCriterion("MODITIME in", values, "moditime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModitimeNotIn(List<Date> values) {
+            addCriterion("MODITIME not in", values, "moditime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModitimeBetween(Date value1, Date value2) {
+            addCriterion("MODITIME between", value1, value2, "moditime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModitimeNotBetween(Date value1, Date value2) {
+            addCriterion("MODITIME not between", value1, value2, "moditime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/WqLrinfB.java

@@ -0,0 +1,72 @@
+package com.hnac.hzims.baseinfo.entity;
+
+import java.math.BigDecimal;
+
+/**
+ * 湖库<国标>
+ * 
+ * @author moze
+ *
+ */
+public class WqLrinfB {
+	private String lrcd; // 湖库代码
+
+	private String watp; // 水域类型
+
+	private String lrnm; // 湖（库）名称
+
+	private BigDecimal lrar; // 湖（库）面积
+
+	private BigDecimal rscp; // 水库库容
+
+	private String coordinateset; // 经纬集合
+
+	public String getCoordinateset() {
+		return coordinateset;
+	}
+
+	public void setCoordinateset(String coordinateset) {
+		this.coordinateset = coordinateset;
+	}
+
+	public String getLrcd() {
+		return lrcd;
+	}
+
+	public void setLrcd(String lrcd) {
+		this.lrcd = lrcd;
+	}
+
+	public String getWatp() {
+		return watp;
+	}
+
+	public void setWatp(String watp) {
+		this.watp = watp;
+	}
+
+	public String getLrnm() {
+		return lrnm;
+	}
+
+	public void setLrnm(String lrnm) {
+		this.lrnm = lrnm;
+	}
+
+	public BigDecimal getLrar() {
+		return lrar;
+	}
+
+	public void setLrar(BigDecimal lrar) {
+		this.lrar = lrar;
+	}
+
+	public BigDecimal getRscp() {
+		return rscp;
+	}
+
+	public void setRscp(BigDecimal rscp) {
+		this.rscp = rscp;
+	}
+
+}

hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/WqLrinfBExample.java

@@ -0,0 +1,601 @@
+package com.hnac.hzims.baseinfo.entity;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+public class WqLrinfBExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public WqLrinfBExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andLrcdIsNull() {
+            addCriterion("LRCD is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrcdIsNotNull() {
+            addCriterion("LRCD is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrcdEqualTo(String value) {
+            addCriterion("LRCD =", value, "lrcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrcdNotEqualTo(String value) {
+            addCriterion("LRCD <>", value, "lrcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrcdGreaterThan(String value) {
+            addCriterion("LRCD >", value, "lrcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrcdGreaterThanOrEqualTo(String value) {
+            addCriterion("LRCD >=", value, "lrcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrcdLessThan(String value) {
+            addCriterion("LRCD <", value, "lrcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrcdLessThanOrEqualTo(String value) {
+            addCriterion("LRCD <=", value, "lrcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrcdLike(String value) {
+            addCriterion("LRCD like", value, "lrcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrcdNotLike(String value) {
+            addCriterion("LRCD not like", value, "lrcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrcdIn(List<String> values) {
+            addCriterion("LRCD in", values, "lrcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrcdNotIn(List<String> values) {
+            addCriterion("LRCD not in", values, "lrcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrcdBetween(String value1, String value2) {
+            addCriterion("LRCD between", value1, value2, "lrcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrcdNotBetween(String value1, String value2) {
+            addCriterion("LRCD not between", value1, value2, "lrcd");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatpIsNull() {
+            addCriterion("WATP is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatpIsNotNull() {
+            addCriterion("WATP is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatpEqualTo(String value) {
+            addCriterion("WATP =", value, "watp");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatpNotEqualTo(String value) {
+            addCriterion("WATP <>", value, "watp");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatpGreaterThan(String value) {
+            addCriterion("WATP >", value, "watp");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatpGreaterThanOrEqualTo(String value) {
+            addCriterion("WATP >=", value, "watp");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatpLessThan(String value) {
+            addCriterion("WATP <", value, "watp");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatpLessThanOrEqualTo(String value) {
+            addCriterion("WATP <=", value, "watp");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatpLike(String value) {
+            addCriterion("WATP like", value, "watp");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatpNotLike(String value) {
+            addCriterion("WATP not like", value, "watp");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatpIn(List<String> values) {
+            addCriterion("WATP in", values, "watp");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatpNotIn(List<String> values) {
+            addCriterion("WATP not in", values, "watp");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatpBetween(String value1, String value2) {
+            addCriterion("WATP between", value1, value2, "watp");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatpNotBetween(String value1, String value2) {
+            addCriterion("WATP not between", value1, value2, "watp");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrnmIsNull() {
+            addCriterion("LRNM is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrnmIsNotNull() {
+            addCriterion("LRNM is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrnmEqualTo(String value) {
+            addCriterion("LRNM =", value, "lrnm");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrnmNotEqualTo(String value) {
+            addCriterion("LRNM <>", value, "lrnm");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrnmGreaterThan(String value) {
+            addCriterion("LRNM >", value, "lrnm");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrnmGreaterThanOrEqualTo(String value) {
+            addCriterion("LRNM >=", value, "lrnm");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrnmLessThan(String value) {
+            addCriterion("LRNM <", value, "lrnm");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrnmLessThanOrEqualTo(String value) {
+            addCriterion("LRNM <=", value, "lrnm");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrnmLike(String value) {
+            addCriterion("LRNM like", value, "lrnm");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrnmNotLike(String value) {
+            addCriterion("LRNM not like", value, "lrnm");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrnmIn(List<String> values) {
+            addCriterion("LRNM in", values, "lrnm");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrnmNotIn(List<String> values) {
+            addCriterion("LRNM not in", values, "lrnm");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrnmBetween(String value1, String value2) {
+            addCriterion("LRNM between", value1, value2, "lrnm");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrnmNotBetween(String value1, String value2) {
+            addCriterion("LRNM not between", value1, value2, "lrnm");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrarIsNull() {
+            addCriterion("LRAR is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrarIsNotNull() {
+            addCriterion("LRAR is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrarEqualTo(BigDecimal value) {
+            addCriterion("LRAR =", value, "lrar");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrarNotEqualTo(BigDecimal value) {
+            addCriterion("LRAR <>", value, "lrar");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrarGreaterThan(BigDecimal value) {
+            addCriterion("LRAR >", value, "lrar");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrarGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("LRAR >=", value, "lrar");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrarLessThan(BigDecimal value) {
+            addCriterion("LRAR <", value, "lrar");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrarLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("LRAR <=", value, "lrar");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrarIn(List<BigDecimal> values) {
+            addCriterion("LRAR in", values, "lrar");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrarNotIn(List<BigDecimal> values) {
+            addCriterion("LRAR not in", values, "lrar");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrarBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("LRAR between", value1, value2, "lrar");
+            return (Criteria) this;
+        }
+
+        public Criteria andLrarNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("LRAR not between", value1, value2, "lrar");
+            return (Criteria) this;
+        }
+
+        public Criteria andRscpIsNull() {
+            addCriterion("RSCP is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRscpIsNotNull() {
+            addCriterion("RSCP is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRscpEqualTo(BigDecimal value) {
+            addCriterion("RSCP =", value, "rscp");
+            return (Criteria) this;
+        }
+
+        public Criteria andRscpNotEqualTo(BigDecimal value) {
+            addCriterion("RSCP <>", value, "rscp");
+            return (Criteria) this;
+        }
+
+        public Criteria andRscpGreaterThan(BigDecimal value) {
+            addCriterion("RSCP >", value, "rscp");
+            return (Criteria) this;
+        }
+
+        public Criteria andRscpGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("RSCP >=", value, "rscp");
+            return (Criteria) this;
+        }
+
+        public Criteria andRscpLessThan(BigDecimal value) {
+            addCriterion("RSCP <", value, "rscp");
+            return (Criteria) this;
+        }
+
+        public Criteria andRscpLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("RSCP <=", value, "rscp");
+            return (Criteria) this;
+        }
+
+        public Criteria andRscpIn(List<BigDecimal> values) {
+            addCriterion("RSCP in", values, "rscp");
+            return (Criteria) this;
+        }
+
+        public Criteria andRscpNotIn(List<BigDecimal> values) {
+            addCriterion("RSCP not in", values, "rscp");
+            return (Criteria) this;
+        }
+
+        public Criteria andRscpBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("RSCP between", value1, value2, "rscp");
+            return (Criteria) this;
+        }
+
+        public Criteria andRscpNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("RSCP not between", value1, value2, "rscp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetIsNull() {
+            addCriterion("COORDINATESET is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetIsNotNull() {
+            addCriterion("COORDINATESET is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetEqualTo(String value) {
+            addCriterion("COORDINATESET =", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetNotEqualTo(String value) {
+            addCriterion("COORDINATESET <>", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetGreaterThan(String value) {
+            addCriterion("COORDINATESET >", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetGreaterThanOrEqualTo(String value) {
+            addCriterion("COORDINATESET >=", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetLessThan(String value) {
+            addCriterion("COORDINATESET <", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetLessThanOrEqualTo(String value) {
+            addCriterion("COORDINATESET <=", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetLike(String value) {
+            addCriterion("COORDINATESET like", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetNotLike(String value) {
+            addCriterion("COORDINATESET not like", value, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetIn(List<String> values) {
+            addCriterion("COORDINATESET in", values, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetNotIn(List<String> values) {
+            addCriterion("COORDINATESET not in", values, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetBetween(String value1, String value2) {
+            addCriterion("COORDINATESET between", value1, value2, "coordinateset");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinatesetNotBetween(String value1, String value2) {
+            addCriterion("COORDINATESET not between", value1, value2, "coordinateset");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/vo/ReservoirInfoVo.java

@@ -0,0 +1,64 @@
+package com.hnac.hzims.baseinfo.vo;
+
+
+import com.hnac.hzims.baseinfo.entity.FileReservoirInfo;
+import com.hnac.hzims.baseinfo.entity.ImageReservoirInfo;
+import com.hnac.hzims.baseinfo.entity.ReservoirInfo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ReservoirInfoVo extends ReservoirInfo {
+	private String rz; // 水位
+	private String INQ; // 流量
+
+
+	private List<ImageReservoirInfo> imageReservoirInfoList;
+
+	private  List<FileReservoirInfo> fileReservoirInfoList;
+
+	public ReservoirInfoVo() {
+
+	}
+
+	public ReservoirInfoVo(ReservoirInfo vo) {
+		this.setAveragerainfall(vo.getAveragerainfall());
+		this.setBuilddate(vo.getBuilddate());
+		this.setChecdedtotalflow(vo.getChecdedtotalflow());
+		this.setCheckedfloodlevel(vo.getCheckedfloodlevel());
+		this.setCheckedmaxflow(vo.getCheckedmaxflow());
+		this.setChedkedfloodflow(vo.getChedkedfloodflow());
+		this.setCompleteddate(vo.getCompleteddate());
+		this.setDeadlevel(vo.getDeadlevel());
+		this.setDesignedfillarea(vo.getDesignedfillarea());
+		this.setDesignedfloodflow(vo.getDesignedfloodflow());
+		this.setDesignedfloodlevel(vo.getDesignedfloodlevel());
+		this.setDesignedmaxflow(vo.getDesignedmaxflow());
+		this.setDesignedtotalflow(vo.getDesignedtotalflow());
+		this.setDischarge(vo.getDischarge());
+		this.setFloodcontrolvolume(vo.getFloodcontrolvolume());
+		this.setFlooddetentionvolume(vo.getFlooddetentionvolume());
+		this.setHistoricalmaxlevel(vo.getHistoricalmaxlevel());
+		this.setLocation(vo.getLocation());
+		this.setMaxleveltime(vo.getMaxleveltime());
+		this.setName(vo.getName());
+		this.setNorrmallevel(vo.getNorrmallevel());
+		this.setRainarea(vo.getRainarea());
+		this.setRoadconditiion(vo.getRoadconditiion());
+		this.setRoadlength(vo.getRoadlength());
+		this.setStationid(vo.getStationid());
+		this.setStcd(vo.getStcd());
+		this.setUtilizablevolume(vo.getUtilizablevolume());
+		this.setVillage(vo.getVillage());
+		this.setVolume(vo.getVolume());
+		this.setBeiw(vo.getBeiw());
+		this.setDongj(vo.getDongj());
+		this.setMjflsscnwl(vo.getMjflsscnwl());
+		setAreaCode(vo.getAreaCode());
+		setLrcd(vo.getLrcd());
+		setSzhldm(vo.getSzhldm());
+
+	}
+
+}

hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/vo/ReservoirRefdataVo.java

@@ -0,0 +1,57 @@
+package com.hnac.hzims.baseinfo.vo;
+
+
+import com.hnac.hzims.baseinfo.entity.ReservoirRefdata;
+
+public class ReservoirRefdataVo extends ReservoirRefdata {
+	private String refqFactory; // 关联流量数据点point
+	private String refqGroupId; // 关联流量数据点point
+	private String refzFactory; // 关联水位数据点
+	private String refzGroupId; // 关联水位数据点
+	
+	public ReservoirRefdataVo(){
+		
+	}
+	
+	public ReservoirRefdataVo(ReservoirRefdata  model){
+		setStcd(model.getStcd());
+		setRefstcd(model.getRefstcd());
+		setRefzpoint(model.getRefzpoint());
+		setRefqpoint(model.getRefqpoint());
+	}
+
+	public String getRefqFactory() {
+		return refqFactory;
+	}
+
+	public void setRefqFactory(String refqFactory) {
+		this.refqFactory = refqFactory;
+	}
+
+	public String getRefqGroupId() {
+		return refqGroupId;
+	}
+
+	public void setRefqGroupId(String refqGroupId) {
+		this.refqGroupId = refqGroupId;
+	}
+
+	public String getRefzFactory() {
+		return refzFactory;
+	}
+
+	public void setRefzFactory(String refzFactory) {
+		this.refzFactory = refzFactory;
+	}
+
+	public String getRefzGroupId() {
+		return refzGroupId;
+	}
+
+	public void setRefzGroupId(String refzGroupId) {
+		this.refzGroupId = refzGroupId;
+	}
+
+	
+
+}

hzims-service-api/common-api/pom.xml

@@ -21,7 +21,11 @@
     </properties>
 
     <dependencies>
-
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <version>2.8.2</version>
+        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>

hzims-service-api/common-api/src/main/java/com/hnac/hzims/cache/CaffeineCacheUtil.java

@@ -0,0 +1,94 @@
+package com.hnac.hzims.cache;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.hnac.hzims.entity.Report;
+import com.hnac.hzims.entity.YearReport;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+//Caffeine采用了W-TinyLFU（LUR和LFU的优点结合）开源的缓存技术。缓存性能接近理论最优，属于是Guava Cache的增强版
+public class CaffeineCacheUtil {
+
+    //创建guava cache
+    private static Cache<String, Report> loadingCache = Caffeine.newBuilder()
+            //cache的初始容量
+            .initialCapacity(5)
+            //cache最大缓存数
+            .maximumSize(50)
+            //设置写缓存后n秒钟过期
+            .expireAfterWrite(1, TimeUnit.HOURS)
+            //设置读写缓存后n秒钟过期,实际很少用到,类似于expireAfterWrite
+            //.expireAfterAccess(17, TimeUnit.SECONDS)
+            .build();
+
+    private static Cache<String, YearReport> loadingYearCache = Caffeine.newBuilder()
+            //cache的初始容量
+            .initialCapacity(5)
+            //cache最大缓存数
+            .maximumSize(50)
+            //设置写缓存后n秒钟过期
+            .expireAfterWrite(1, TimeUnit.HOURS)
+            //设置读写缓存后n秒钟过期,实际很少用到,类似于expireAfterWrite
+            //.expireAfterAccess(17, TimeUnit.SECONDS)
+            .build();
+
+    private static Cache<String, List<Map<String,Object>>> loadingMapCache = Caffeine.newBuilder()
+            //cache的初始容量
+            .initialCapacity(5)
+            //cache最大缓存数
+            .maximumSize(50)
+            //设置写缓存后n秒钟过期
+            .expireAfterWrite(1, TimeUnit.HOURS)
+            //设置读写缓存后n秒钟过期,实际很少用到,类似于expireAfterWrite
+            //.expireAfterAccess(17, TimeUnit.SECONDS)
+            .build();
+
+    public static void add(String key, Report report){
+        // 往缓存写数据
+        if(report!=null) {
+            loadingCache.put(key, report);
+        }
+
+//        // 获取value的值，如果key不存在，获取value后再返回
+//        String value = loadingCache.get(key, CaffeineCacheTest::getValueFromDB);
+//        System.out.println(value);
+//        // 删除key
+//        loadingCache.invalidate(key);
+    }
+
+    public static void addYear(String key, YearReport report){
+        // 往缓存写数据
+        if(report!=null) {
+            loadingYearCache.put(key, report);
+        }
+    }
+
+    public static void addMap(String key, List<Map<String,Object>> report){
+        // 往缓存写数据
+        if(report!=null && !report.isEmpty()) {
+            loadingMapCache.put(key, report);
+        }
+    }
+
+    public static List<Map<String,Object>> getMap(String key){
+//        // 获取value的值，如果key不存在，获取value后再返回
+        List<Map<String,Object>> report = loadingMapCache.getIfPresent(key);
+        return report;
+    }
+
+    public static YearReport getYear(String key){
+//        // 获取value的值，如果key不存在，获取value后再返回
+        YearReport report = loadingYearCache.getIfPresent(key);
+        return report;
+    }
+
+    public static Report get(String key){
+//        // 获取value的值，如果key不存在，获取value后再返回
+        Report report = loadingCache.getIfPresent(key);
+        return report;
+    }
+
+}

hzims-service-api/common-api/src/main/java/com/hnac/hzims/entity/Report.java

@@ -0,0 +1,273 @@
+package com.hnac.hzims.entity;
+
+import com.hnac.hzims.enums.QueryDateTypeEnum;
+import com.hnac.hzims.util.ReportDateUtil;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 提供出去的报表
+ * 提供基础业务数据以及统计数据
+ *
+ * @Author: liugang
+ * @Date: 2019/7/8 15:03
+ */
+public class Report {
+
+    /**
+     * (唯一标识key,标题名称value),
+     */
+    private List<Map<String, String>> title;
+
+    /**
+     * 报表基础数据
+     */
+    private List<ReportUnit> data;
+
+    /**
+     * 附加报表统计数据
+     */
+    private List<ReportUnit> standardData;
+
+    /**
+     * 初始化基础报表数据
+     * 把数据全部置为初始状态("-")
+     *
+     * @return
+     */
+    public void initBaseReport(int size, Date begin, Date end, QueryDateTypeEnum dtEnum) {
+        data = new ArrayList<>();
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(begin);
+        SimpleDateFormat sdf = ReportDateUtil.getSimpleDateFormatByType(dtEnum);
+        int step = ReportDateUtil.getCalendarType(dtEnum);
+        Date temp = cal.getTime();
+        while (temp.before(end)) {
+            String key = sdf.format(temp);
+            ReportUnit unit = new ReportUnit();
+            unit.init(key, size);
+            data.add(unit);
+            cal.set(step, cal.get(step) + 1);
+            temp = cal.getTime();
+        }
+    }
+
+    public void initBaseReportMonth(int day,int month){
+        data = new ArrayList<>();
+        for(int i=1;i<=day;i++){
+            String key=i> 9 ? ""+i:"0"+i;
+            ReportUnit unit = new ReportUnit();
+            unit.init(key, month);
+            data.add(unit);
+        }
+        ReportUnit unit = new ReportUnit();
+        unit.init("max", month);
+        data.add(unit);
+
+        unit = new ReportUnit();
+        unit.init("maxDate", month);
+        data.add(unit);
+
+        unit = new ReportUnit();
+        unit.init("min", month);
+        data.add(unit);
+
+        unit = new ReportUnit();
+        unit.init("minDate", month);
+        data.add(unit);
+
+        unit = new ReportUnit();
+        unit.init("avg", month);
+        data.add(unit);
+    }
+
+    public void initBaseReportMaxMin(int size, Date begin, Date end, QueryDateTypeEnum dtEnum) {
+        initBaseReport(size,  begin,  end,  dtEnum);
+        ReportUnit unit = new ReportUnit();
+        unit.init("max", size);
+        data.add(unit);
+
+        unit = new ReportUnit();
+        unit.init("maxDate", size);
+        data.add(unit);
+
+        unit = new ReportUnit();
+        unit.init("min", size);
+        data.add(unit);
+
+        unit = new ReportUnit();
+        unit.init("minDate", size);
+        data.add(unit);
+
+        unit = new ReportUnit();
+        unit.init("avg", size);
+        data.add(unit);
+
+        unit = new ReportUnit();
+        unit.init("range", size);//极差
+        data.add(unit);
+    }
+
+    public void initBaseReportHistory(int size){
+        data = new ArrayList<>();
+        ReportUnit unit = new ReportUnit();
+        unit.init("max", size);
+        data.add(unit);
+
+        unit = new ReportUnit();
+        unit.init("maxDate", size);
+        data.add(unit);
+
+        unit = new ReportUnit();
+        unit.init("min", size);
+        data.add(unit);
+
+        unit = new ReportUnit();
+        unit.init("minDate", size);
+        data.add(unit);
+
+        unit = new ReportUnit();
+        unit.init("avg", size);
+        data.add(unit);
+
+        unit = new ReportUnit();
+        unit.init("range", size);//极差
+        data.add(unit);
+    }
+
+    public void initCompareBaseReport(int size, Date begin, Date end, QueryDateTypeEnum dtEnum) {
+        data = new ArrayList<>();
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(begin);
+        SimpleDateFormat sdf = new SimpleDateFormat("MM-dd");
+        int step = ReportDateUtil.getCalendarType(dtEnum);
+        Date temp = cal.getTime();
+        while (temp.before(end)) {
+            String key = sdf.format(temp);
+            ReportUnit unit = new ReportUnit();
+            unit.init(key, size);
+            data.add(unit);
+            cal.set(step, cal.get(step) + 1);
+            temp = cal.getTime();
+        }
+    }
+
+    public void initBaseRingReport(int size, Date begin, Date end, QueryDateTypeEnum dtEnum){
+        data = new ArrayList<>();
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(begin);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
+        int step = ReportDateUtil.getCalendarType(dtEnum);
+        Date temp = cal.getTime();
+        while (temp.before(end)) {
+            String key = sdf.format(temp);
+            ReportUnit unit = new ReportUnit();
+            unit.init(key, size);
+            data.add(unit);
+            cal.set(step, cal.get(step) + 1);
+            temp = cal.getTime();
+        }
+    }
+
+    public void initRingBaseReport(int size, Date begin, Date end, QueryDateTypeEnum dtEnum) {
+        data = new ArrayList<>();
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(begin);
+        SimpleDateFormat sdf = new SimpleDateFormat("MM-dd");
+        int step = ReportDateUtil.getCalendarType(dtEnum);
+        Date temp = cal.getTime();
+        while (temp.before(end)) {
+            String key = sdf.format(temp);
+            ReportUnit unit = new ReportUnit();
+            unit.init(key, size);
+            data.add(unit);
+            cal.set(step, cal.get(step) + 1);
+            temp = cal.getTime();
+        }
+    }
+
+    /**
+     * 初始化统计数据
+     *
+     * @param size 大小
+     * @param keys 统计数据类型
+     */
+    public void initStandardReport(int size, String[] keys) {
+        standardData = new ArrayList<>();
+        for (String key : keys) {
+            standardData.add(initSingleStandard(key, size));
+        }
+    }
+
+    private ReportUnit initSingleStandard(String key, int size) {
+        ReportUnit unit = new ReportUnit();
+        unit.setKey(key);
+        unit.setDataList(new ArrayList<>());
+        for (int i = 0; i < size; i++) {
+            unit.getDataList().add("-");
+        }
+        return unit;
+    }
+
+    /**
+     * 修改唯一标识标定的数据对象(基础数据)
+     *
+     * @param key   唯一标识
+     * @param index 修改的数据索引
+     * @param value 修改的值
+     */
+    public void setBaseCell(String key, int index, String value) {
+        for (ReportUnit unit : data) {
+            if (unit.getKey().equals(key)) {
+                unit.getDataList().set(index, value);
+            }
+        }
+    }
+
+    /**
+     * 修改唯一标识标定的数据对象(标准数据)
+     *
+     * @param key   唯一标识
+     * @param index 修改的数据索引
+     * @param value 修改的值
+     */
+    public void setStandardCell(String key, int index, String value) {
+        for (ReportUnit unit : standardData) {
+            if (unit.getKey().equals(key)) {
+                unit.getDataList().set(index, value);
+            }
+        }
+    }
+
+    public List<Map<String, String>> getTitle() {
+        return title;
+    }
+
+    public void setTitle(List<Map<String, String>> title) {
+        this.title = title;
+    }
+
+    public List<ReportUnit> getData() {
+        return data;
+    }
+
+    public void setData(List<ReportUnit> data) {
+        this.data = data;
+    }
+
+    public List<ReportUnit> getStandardData() {
+        return standardData;
+    }
+
+    public void setStandardData(List<ReportUnit> standardData) {
+        this.standardData = standardData;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+}
+

hzims-service-api/common-api/src/main/java/com/hnac/hzims/entity/ReportData.java

@@ -0,0 +1,107 @@
+package com.hnac.hzims.entity;
+
+/**
+ * 封装一个key,value键值对象
+ * 可能是数据库返回查询数据
+ * 也可能是使用的对象由于数据需要置为-
+ * 所以采用String存储处理
+ *
+ * @Author: liugang
+ * @Date: 2019/7/8 16:02
+ */
+public class ReportData {
+
+    private String keyStr;
+
+    private String keyDate;
+
+    private String val;
+    //测站  或  属性
+    private String stcd;
+    //属性名
+    private String name;
+
+    private Double value;
+
+    private int month=-1;
+
+    private String day;
+
+    public String getDay() {
+        return day;
+    }
+
+    public void setDay(String day) {
+        this.day = day;
+    }
+
+    public int getMonth() {
+        return month;
+    }
+
+    public void setMonth(int month) {
+        this.month = month;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getStcd() {
+        return stcd;
+    }
+
+    public void setStcd(String stcd) {
+        this.stcd = stcd;
+    }
+
+    public ReportData() {
+    }
+
+    public String getKeyDate() {
+        return keyDate;
+    }
+
+    public void setKeyDate(String keyDate) {
+        this.keyDate = keyDate;
+    }
+
+    public ReportData(String keyStr, String val) {
+        this.keyStr = keyStr;
+        this.val = val;
+    }
+
+    public String getKeyStr() {
+        return keyStr;
+    }
+
+    public void setKeyStr(String keyStr) {
+        this.keyStr = keyStr;
+    }
+
+    public String getVal() {
+        return val;
+    }
+
+    public void setVal(String val) {
+        this.val = val;
+    }
+
+    public Double getValue() {
+        if(val!=null && !"".equals(val.trim())) {
+            if(val.indexOf("-")==-1) {
+                return Double.valueOf(val);
+            }
+        }
+        return null;
+    }
+
+    public void setValue(Double value) {
+        this.value = value;
+    }
+}
+

hzims-service-api/common-api/src/main/java/com/hnac/hzims/entity/ReportUnit.java

@@ -0,0 +1,34 @@
+package com.hnac.hzims.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ReportUnit {
+    private String key;
+
+    private List<String> dataList;
+
+    public void init(String key, int size) {
+        this.key = key;
+        dataList = new ArrayList<>();
+        for (int i = 0; i < size; i++) {
+            dataList.add("-");
+        }
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public List<String> getDataList() {
+        return dataList;
+    }
+
+    public void setDataList(List<String> dataList) {
+        this.dataList = dataList;
+    }
+}

hzims-service-api/common-api/src/main/java/com/hnac/hzims/entity/StandardData.java

@@ -0,0 +1,174 @@
+package com.hnac.hzims.entity;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.Objects;
+
+public class StandardData {
+    public static final String STANDARD_AVG = "时刻平均值";
+    public static final String STANDARD_MAX = "时刻最大值";
+    public static final String STANDARD_MAX_DATE = "最大值出现的时间";
+    public static final String STANDARD_MIN = "时刻最小值";
+    public static final String STANDARD_MIN_DATE = "最小值出现的时间";
+    public static final String STANDARD_AMPLITUDE = "最大变幅";
+    public static final String STANDARD_SUM = "总量";
+
+    /**
+     * 平均值
+     */
+    private String dataAvg;
+    /**
+     * 最大值
+     */
+    private String dataMax;
+    /**
+     * 最大值时间
+     */
+    private String dataMaxDate;
+    /**
+     * 最小值
+     */
+    private String dataMin;
+    /**
+     * 最小值出现时间
+     */
+    private String dataMinDate;
+    /**
+     * 最大变幅
+     */
+    private String amplitude;
+    /**
+     * 总量
+     */
+    private String dataSum;
+
+    /**
+     * 比较并处理最大值和最大值日期
+     *
+     * @param value 被比较值
+     * @param date  日期
+     */
+    public void compareDealMax(String value, String date) {
+        if (Objects.isNull(dataMax)) {
+            dataMax = value;
+            dataMaxDate = date;
+        } else {
+            if (Double.valueOf(dataMax) < Double.valueOf(value)) {
+                dataMax = value;
+                dataMaxDate = date;
+            }
+        }
+    }
+
+    /**
+     * 比较并处理最小值和最小值日期
+     *
+     * @param value 被比较值
+     * @param date  日期
+     */
+    public void compareDealMin(String value, String date) {
+        if (Objects.isNull(dataMin)) {
+            dataMin = value;
+            dataMinDate = date;
+        } else {
+            if (Double.valueOf(value) < Double.valueOf(dataMin)) {
+                dataMin = value;
+                dataMinDate = date;
+            }
+        }
+    }
+
+    /**
+     * 默认计算总和,如有其他逻辑请继承后改写
+     *
+     * @param value
+     */
+    public void countSum(String value) {
+        if (Objects.isNull(dataSum)) {
+            dataSum = value;
+        } else {
+            dataSum = new BigDecimal(value).add(new BigDecimal(dataSum)).toString();
+        }
+    }
+
+    /**
+     * 处理空数据,如果数据为空则置-
+     */
+    public void dealNullData() {
+        if (StringUtils.isEmpty(dataAvg)) {
+            dataAvg = "-";
+        }
+        if (StringUtils.isEmpty(dataMax)) {
+            dataMax = "-";
+        }
+        if (StringUtils.isEmpty(dataMaxDate)) {
+            dataMaxDate = "-";
+        }
+        if (StringUtils.isEmpty(dataMin)) {
+            dataMin = "-";
+        }
+        if (StringUtils.isEmpty(dataMinDate)) {
+            dataMinDate = "-";
+        }
+        if (StringUtils.isEmpty(dataSum)) {
+            dataSum = "-";
+        }
+    }
+
+    public String getDataAvg() {
+        return dataAvg;
+    }
+
+    public void setDataAvg(String dataAvg) {
+        this.dataAvg = dataAvg;
+    }
+
+    public String getDataMax() {
+        return dataMax;
+    }
+
+    public void setDataMax(String dataMax) {
+        this.dataMax = dataMax;
+    }
+
+    public String getDataMaxDate() {
+        return dataMaxDate;
+    }
+
+    public void setDataMaxDate(String dataMaxDate) {
+        this.dataMaxDate = dataMaxDate;
+    }
+
+    public String getDataMin() {
+        return dataMin;
+    }
+
+    public void setDataMin(String dataMin) {
+        this.dataMin = dataMin;
+    }
+
+    public String getDataMinDate() {
+        return dataMinDate;
+    }
+
+    public void setDataMinDate(String dataMinDate) {
+        this.dataMinDate = dataMinDate;
+    }
+
+    public String getAmplitude() {
+        return amplitude;
+    }
+
+    public void setAmplitude(String amplitude) {
+        this.amplitude = amplitude;
+    }
+
+    public String getDataSum() {
+        return dataSum;
+    }
+
+    public void setDataSum(String dataSum) {
+        this.dataSum = dataSum;
+    }
+}

hzims-service-api/common-api/src/main/java/com/hnac/hzims/entity/YearReport.java

@@ -0,0 +1,178 @@
+package com.hnac.hzims.entity;
+
+
+
+import com.hnac.hzims.util.ReportDateUtil;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+public class YearReport {
+    private static final int MAX_DAY = 31;
+
+    private int year;
+    private String stcd;
+
+    /**
+     * 一个List<String>代表1个月
+     * 1个List<String>有31个Double对象代表每一天
+     * 如果没有数据或者天不存在就用-表示
+     */
+    private List<List<String>> dayList;
+
+    /**
+     * 一个key代表统计数据类型,value代表每个月统计数据值
+     * 例如<最大值,12个月的数据>
+     * 最大值,最小值,平均值等等组成一个List
+     */
+    private List<ReportUnit> monthList;
+
+    /**
+     * 全年统计数据
+     */
+    private List<ReportData> yearList;
+
+    public void init(String stcd, Integer year) {
+        this.year = year;
+        this.stcd = stcd;
+        initDayList();
+    }
+
+    /**
+     * 依据年份初始化年度报表,每个月的每天都加上-
+     * 目前不存在的年份也加上了-
+     * 如果有需求,则只把有日期的天上加上-
+     */
+    public void initDayList() {
+        dayList = new ArrayList<>();
+        for (int month = 0; month <= ReportDateUtil.MAX_MONTH; month++) {
+            dayList.add(new ArrayList<>());
+            for (int day = 0; day < MAX_DAY; day++) {
+                dayList.get(month).add("-");
+            }
+        }
+    }
+
+    /**
+     * 初始化月份统计数据
+     *
+     * @param keys 最大值,最小值,平均值等
+     */
+    public void initMonthList(String[] keys) {
+        monthList = new ArrayList<>();
+        for (String key : keys) {
+            ReportUnit reportUnit = new ReportUnit();
+            reportUnit.setKey(key);
+            List<String> list = new ArrayList<>();
+            for (int month = 0; month <= ReportDateUtil.MAX_MONTH; month++) {
+                list.add("-");
+            }
+            reportUnit.setDataList(list);
+            monthList.add(reportUnit);
+        }
+    }
+
+    /**
+     * 获取某类型每个月的数据
+     *
+     * @param key
+     * @return
+     */
+    public ReportUnit getMonthKeyList(String key) {
+        for (ReportUnit reportUnit : monthList) {
+            if (reportUnit.getKey().equals(key)) {
+                return reportUnit;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 提供出去的设置每天数据
+     *
+     * @param month 0-11月
+     * @param day   1-31日
+     * @param value 值
+     */
+    public void setDayValue(int month, int day, String value) {
+        dayList.get(month).set(day - 1, value);
+    }
+
+    /**
+     * 提供出去的设置每月的统计数据
+     *
+     * @param key   类型(最大值,最小值等)
+     * @param month 0-11月
+     * @param value 值
+     */
+    public void setMonthValue(String key, int month, String value) {
+        for (ReportUnit reportUnit : monthList) {
+            if (reportUnit.getKey().equals(key)) {
+                reportUnit.getDataList().set(month, value);
+            }
+        }
+    }
+
+    /**
+     * 针对数据进行求和计算
+     *
+     * @param list
+     * @return
+     */
+    public String sum(List<String> list) {
+        String temp = null;
+        for (String data : list) {
+            if ("-".equals(data) || Double.valueOf(data) <= 0) {
+                continue;
+            }
+            if (Objects.isNull(temp)) {
+                temp = data;
+            } else {
+                temp = new BigDecimal(temp).add(new BigDecimal(data)).toString();
+            }
+        }
+        return temp;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
+
+    public String getStcd() {
+        return stcd;
+    }
+
+    public void setStcd(String stcd) {
+        this.stcd = stcd;
+    }
+
+    public List<List<String>> getDayList() {
+        return dayList;
+    }
+
+    public void setDayList(List<List<String>> dayList) {
+        this.dayList = dayList;
+    }
+
+    public List<ReportUnit> getMonthList() {
+        return monthList;
+    }
+
+    public void setMonthList(List<ReportUnit> monthList) {
+        this.monthList = monthList;
+    }
+
+    public List<ReportData> getYearList() {
+        return yearList;
+    }
+
+    public void setYearList(List<ReportData> yearList) {
+        this.yearList = yearList;
+    }
+}

hzims-service-api/common-api/src/main/java/com/hnac/hzims/enums/QueryDateTypeEnum.java

@@ -0,0 +1,35 @@
+package com.hnac.hzims.enums;
+
+public enum QueryDateTypeEnum {
+    //时
+    HOUR("hour"),
+    //日
+    DAY("day"),
+    //月
+    MONTH("month"),
+    //年
+    YEAR("year");
+
+    private String queryDateType;
+
+    QueryDateTypeEnum(String queryDateType) {
+        this.queryDateType = queryDateType;
+    }
+
+    public static QueryDateTypeEnum getInstance(String queryDateType) {
+        for (QueryDateTypeEnum queryTypeEnum : QueryDateTypeEnum.values()) {
+            if (queryTypeEnum.getQueryDateType().equals(queryDateType)) {
+                return queryTypeEnum;
+            }
+        }
+        return null;
+    }
+
+    public String getQueryDateType() {
+        return queryDateType;
+    }
+
+    public void setQueryDateType(String queryDateType) {
+        this.queryDateType = queryDateType;
+    }
+}

hzims-service-api/common-api/src/main/java/com/hnac/hzims/util/CommonUtil.java

@@ -0,0 +1,148 @@
+package com.hnac.hzims.util;
+
+
+import com.hnac.hzims.entity.ReportData;
+import com.hnac.hzims.enums.QueryDateTypeEnum;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+public class CommonUtil {
+    /**
+     * 检查查询类型是否符合
+     *
+     * @param type
+     */
+    public static QueryDateTypeEnum checkType(String type) {
+        QueryDateTypeEnum dtEnum = QueryDateTypeEnum.getInstance(type);
+        if (Objects.isNull(dtEnum)) {
+            return null;
+        }
+        return dtEnum;
+    }
+
+    public static Date getHistoryDate(Date now,int year){
+        Calendar calendar = Calendar.getInstance(); //创建Calendar 的实例
+        calendar.setTime(now);
+        calendar.add(Calendar.YEAR, -year);//当前时间减去一年，即一年前的时间
+        return calendar.getTime();
+    }
+
+    public static String getLastDayOfMonth(String yearMonth)
+    {
+        String[] arr=yearMonth.split("-");
+        Calendar cal = Calendar.getInstance();
+        //设置年份
+        int year=Integer.valueOf(arr[0]);
+        cal.set(Calendar.YEAR,year);
+        //设置月份
+        int month=Integer.valueOf(arr[1]);
+        cal.set(Calendar.MONTH, month-1);
+        //获取某月最大天数
+        int lastDay = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
+        //设置日历中月份的最大天数
+        cal.set(Calendar.DAY_OF_MONTH, lastDay);
+        //格式化日期
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String lastDayOfMonth = sdf.format(cal.getTime());
+
+        return lastDayOfMonth;
+    }
+
+    public static int getYearGap(Date start,Date end){
+        Calendar calStartTime = Calendar.getInstance(); //获取日历实例
+        Calendar calEndTime = Calendar.getInstance();
+        calStartTime.setTime(start);
+        calEndTime.setTime(end);
+        return calEndTime.get(Calendar.YEAR) - calStartTime.get(Calendar.YEAR);
+    }
+
+
+    public static Map<String, Date> getStartEnd(String  beginSpt, String endSpt){
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date begin = null;
+        Date end = null;
+        try {
+            begin = sdf.parse(beginSpt);
+            end = sdf.parse(endSpt);
+        } catch (Exception e) {
+            return null;
+        }
+
+        Map<String,Date> res=new HashMap<>();
+        res.put("begin",begin);
+        res.put("end",end);
+        return res;
+    }
+
+    public static String getKey(String str) {
+        String[] arr=str.split(" ");
+        String arr0=arr[0];
+        String[] keys=arr0.split("-");
+        String key=keys[1]+"-"+keys[2];
+        return key;
+    }
+
+
+    public static List<ReportData> getReportDataBySignage(List<ReportData> timeDataList, String signage){
+        List<ReportData> list=new ArrayList<>();
+        for(ReportData data:timeDataList){
+            if(signage.equals(data.getStcd())){
+                list.add(data);
+            }
+        }
+        return list;
+    }
+
+    public static int getMonth(String key) {
+        String[] keys = key.split("-");
+        String month = keys[1];
+        return Integer.valueOf(month);
+    }
+
+    public static String getDay(String key) {
+        String[] keys = key.split("-");
+        String dayHour = keys[2];
+        String[] dayHourArr=dayHour.split(" ");
+        return dayHourArr[0];
+    }
+
+    public static int getHour(String key) {
+        String[] keys = key.split(" ");
+        String dayHour = keys[1];
+        String[] dayHourArr=dayHour.split(":");
+        return Integer.valueOf(dayHourArr[0]);
+    }
+
+    //0-> s(秒) 1->、m(分)、2->h(小时)3->、d(天)4->、w(周)5->、n(自然月)、6->y(自然年)
+    public static String getKeyBySaveTimeType(String key,Integer saveTimeType){
+        if(saveTimeType.intValue() == 2){//小时
+            int index=key.indexOf(":");
+            if(index>0) {
+                String tmp = key.substring(0, index);
+                return tmp;
+            }
+        }
+        if(saveTimeType.intValue() == 3){//天
+            String[] arr=key.split(" ");
+            return arr[0];
+        }
+        if(saveTimeType.intValue() == 5){//月
+            int index=key.lastIndexOf("-");
+            if(index>0) {
+                String tmp = key.substring(0, index);
+                return tmp;
+            }
+        }
+        if(saveTimeType.intValue() == 6){//年
+            int index = key.indexOf("-");
+            if(index>0) {
+                String tmp = key.substring(0, index);
+                return tmp;
+            }
+        }
+        return key;
+    }
+
+}

hzims-service-api/common-api/src/main/java/com/hnac/hzims/util/ReportDateUtil.java

@@ -0,0 +1,116 @@
+package com.hnac.hzims.util;
+
+import com.hnac.hzims.enums.QueryDateTypeEnum;
+import org.apache.commons.lang3.StringUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public class ReportDateUtil {
+    public static final int MAX_MONTH = 11;
+
+    public static int getDateDiff(Date begin, Date end, int step) {
+        //初始化差距
+        int diff = 0;
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(begin);
+        Date temp = cal.getTime();
+        while (temp.before(end)) {
+            diff++;
+            cal.set(step, cal.get(step) + 1);
+            temp = cal.getTime();
+        }
+        return diff;
+    }
+
+    /**
+     * 获取日期
+     *
+     * @param year   年
+     * @param month  月(0-11)
+     * @param day    日(1-31)
+     * @param hour   时
+     * @param minute 分
+     * @param second 秒
+     * @return
+     */
+    public static Date getDate(int year, int month, int day, int hour, int minute, int second) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.YEAR, year);
+        calendar.set(Calendar.MONTH, month);
+        calendar.set(Calendar.DAY_OF_MONTH, day);
+        calendar.set(Calendar.HOUR_OF_DAY, hour);
+        calendar.set(Calendar.MINUTE, minute);
+        calendar.set(Calendar.SECOND, second);
+        calendar.set(Calendar.MILLISECOND, 0);
+        Date date = calendar.getTime();
+        return date;
+    }
+
+    /**
+     * 获取下一个日期(下一年,下一月,下一日等)
+     *
+     * @param curDate
+     * @param field
+     * @return
+     */
+    public static Date getNextDate(Date curDate, int field) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(curDate);
+        calendar.set(field, calendar.get(field) + 1);
+        return calendar.getTime();
+    }
+
+    /**
+     * 依据查询类型获取时间格式类型
+     *
+     * @param dtEnum
+     * @return
+     */
+    public static SimpleDateFormat getSimpleDateFormatByType(QueryDateTypeEnum dtEnum) {
+        switch (dtEnum) {
+            case HOUR:
+                return new SimpleDateFormat("yyyy-MM-dd HH");
+            case DAY:
+                return new SimpleDateFormat("yyyy-MM-dd");
+            case MONTH:
+                return new SimpleDateFormat("yyyy-MM");
+            case YEAR:
+                return new SimpleDateFormat("yyyy");
+            default:
+                return new SimpleDateFormat("yyyy-MM-dd");
+        }
+    }
+
+    /**
+     * 依据查询类型获取日历类型
+     *
+     * @param dtEnum
+     * @return
+     */
+    public static int getCalendarType(QueryDateTypeEnum dtEnum) {
+        switch (dtEnum) {
+            case HOUR:
+                return Calendar.HOUR_OF_DAY;
+            case DAY:
+                return Calendar.DAY_OF_MONTH;
+            case MONTH:
+                return Calendar.MONTH;
+            case YEAR:
+                return Calendar.YEAR;
+            default:
+                return Calendar.DAY_OF_MONTH;
+        }
+    }
+
+    /***
+     * 年月日时分秒 转年月日
+     */
+    public static String getYMDStr(String ymd) {
+        if(StringUtils.isNotEmpty(ymd)){
+            return ymd.substring(0,11);
+        }
+        return "";
+    }
+}

hzims-service-api/dam-safety-api/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <dependencies>
+        <dependency>
+            <groupId>com.hnac.hzinfo.data</groupId>
+            <artifactId>hzinfo-data-sdk</artifactId>
+        </dependency>
+    </dependencies>
+    <parent>
+        <groupId>com.hnac.hzims</groupId>
+        <artifactId>hzims-service-api</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>dam-safety-api</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/TBuilding.java

@@ -0,0 +1,37 @@
+package com.hnac.hzims.damsafety.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * 大坝信息表
+ */
+@Data
+@TableName("t_building")
+public class TBuilding extends BaseEntity {
+    @ApiModelProperty("水库编号")
+    private String rscd;
+    @ApiModelProperty("建筑物名称")
+    private String name;
+    @ApiModelProperty("建筑物分级路径")
+    private String ipath;
+    @ApiModelProperty("简介")
+    private String brief;
+    @ApiModelProperty("图片地址")
+    private String attach;
+    @ApiModelProperty("文件地址")
+    private String filePath;
+
+    //大坝信息
+    @ApiModelProperty("坝类型")
+    private String type;//坝类型
+    @ApiModelProperty("地址")
+    private String address;//地址
+    @ApiModelProperty("坝高")
+    private BigDecimal damHeight;//坝高
+
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/TProjInfo.java

@@ -0,0 +1,38 @@
+package com.hnac.hzims.damsafety.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 工程物信息表
+ */
+@Data
+@TableName("t_projinfo")
+@EqualsAndHashCode(callSuper = true)
+public class TProjInfo extends BaseEntity {
+    @ApiModelProperty("水库编码")
+    private String rscd;
+    @ApiModelProperty("工程名称")
+    private String projName;
+    @ApiModelProperty("工程编号")
+    private String projCode;
+    @ApiModelProperty("开工日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+    @ApiModelProperty("竣工日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date completeDate;
+    @ApiModelProperty("蓄水日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date storeWaterDate;
+    @ApiModelProperty("工程所在位置")
+    private String location;
+    @ApiModelProperty("备注")
+    private String rm;
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/TSectionConfig.java

@@ -0,0 +1,34 @@
+package com.hnac.hzims.damsafety.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 大坝断面数据配置表
+ */
+@Data
+@TableName("t_section_config")
+public class TSectionConfig implements Serializable {
+    @ApiModelProperty("渗流量测点编号")
+    @TableId(type = IdType.INPUT)
+    private String stcd;
+    @ApiModelProperty("断面编号")
+    private String sectionNo;
+    @ApiModelProperty("是否显示浸润线")
+    private String opinion;
+    @ApiModelProperty("x轴")
+    private BigDecimal xzhou;
+    @ApiModelProperty("y轴最大值")
+    private BigDecimal ymax;
+    @ApiModelProperty("y轴最小值")
+    private BigDecimal ymin;
+    @ApiModelProperty("警戒值")
+    private BigDecimal warm;
+
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDamsB.java

@@ -0,0 +1,31 @@
+package com.hnac.hzims.damsafety.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 断面特征点信息表
+ */
+@Data
+@TableName("wrp_dams_b")
+public class WrpDamsB{
+    @ApiModelProperty("断面编号")
+    private String damcd;
+    @ApiModelProperty("特征点编号")
+    @TableId(type= IdType.INPUT)
+    private String damscd;
+    @ApiModelProperty("特征点名称")
+    private String damsnm;
+    @ApiModelProperty("起点距(m)")
+    private BigDecimal redi;
+    @ApiModelProperty("高程(m)")
+    private BigDecimal poel;
+    @ApiModelProperty("更新时间")
+    private Date dtuptm;
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDfrSrhrdsmp.java

@@ -0,0 +1,56 @@
+package com.hnac.hzims.damsafety.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *水平位移监测测点
+ */
+@Data
+@TableName("wrp_dfr_srhrdsmp")
+@EqualsAndHashCode(callSuper = true)
+public class WrpDfrSrhrdsmp extends BaseEntity {
+    @ApiModelProperty("测站编码")
+    private String stcd;
+    @ApiModelProperty("断面编号")
+    private String damcd;
+    @ApiModelProperty("测点编号")
+    private String mpcd;
+    @ApiModelProperty("桩号")
+    private String ch;
+    @ApiModelProperty("轴距")
+    private BigDecimal ofax;
+    @ApiModelProperty("高程")
+    private BigDecimal el;
+    @ApiModelProperty("基准值 X")
+    private BigDecimal stvlx;
+    @ApiModelProperty("基准值 Y")
+    private BigDecimal stvly;
+    @ApiModelProperty("位移阈值")
+    private BigDecimal xyhrds;
+    @ApiModelProperty("型式")
+    private String tp;
+    @ApiModelProperty("基础情况")
+    private String bsin;
+    @ApiModelProperty("安装日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date indt;
+    @ApiModelProperty("测定日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date dtdt;
+    @ApiModelProperty("仪器编号")
+    private String dvcd;
+    @ApiModelProperty("经度")
+    private BigDecimal eslg;
+    @ApiModelProperty("纬度")
+    private BigDecimal nrlt;
+    @ApiModelProperty("备注")
+    private String rm;
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDfrSrvrdsbp.java

@@ -0,0 +1,55 @@
+package com.hnac.hzims.damsafety.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 监测基点表
+ */
+@Data
+@TableName("wrp_dfr_srvrdsbp")
+@EqualsAndHashCode(callSuper = true)
+public class WrpDfrSrvrdsbp extends BaseEntity {
+    @ApiModelProperty("水库代码")
+    private String rscd;
+    @ApiModelProperty("水工建筑物id")
+    private Long hycncd;
+    @ApiModelProperty("基点编号")
+    private String bpcd;
+    @ApiModelProperty("考证信息日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date txindt;
+    @ApiModelProperty("基点类型")
+    private String bptp;
+    @ApiModelProperty("桩号")
+    private String ch;
+    @ApiModelProperty("轴距")
+    private BigDecimal ofax;
+    @ApiModelProperty("高程")
+    private BigDecimal el;
+    @ApiModelProperty("型式")
+    private String tp;
+    @ApiModelProperty("基础情况")
+    private String bsin;
+    @ApiModelProperty("安装日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date indt;
+    @ApiModelProperty("测定日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date dtdt;
+    @ApiModelProperty("经度")
+    private BigDecimal lgtd;
+    @ApiModelProperty("纬度")
+    private BigDecimal lttd;
+    @ApiModelProperty("工作状态")
+    private String wkcn;
+    @ApiModelProperty("备注")
+    private String rm;
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDfrSrvrdsmp.java

@@ -0,0 +1,53 @@
+package com.hnac.hzims.damsafety.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 垂直位移监测测点
+ */
+@Data
+@TableName("wrp_dfr_srvrdsmp")
+@EqualsAndHashCode(callSuper = true)
+public class WrpDfrSrvrdsmp extends BaseEntity {
+    @ApiModelProperty("测站编码")
+    private String stcd;
+    @ApiModelProperty("断面编号")
+    private String damcd;
+    @ApiModelProperty("测点编号")
+    private String mpcd;
+    @ApiModelProperty("桩号")
+    private String ch;
+    @ApiModelProperty("轴距")
+    private BigDecimal ofax;
+    @ApiModelProperty("初始高程")
+    private BigDecimal inel;
+    @ApiModelProperty("位移阈值")
+    private BigDecimal vrds;
+    @ApiModelProperty("型式")
+    private String tp;
+    @ApiModelProperty("基础情况")
+    private String bsin;
+    @ApiModelProperty("安装日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date indt;
+    @ApiModelProperty("测定日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date dtdt;
+    @ApiModelProperty("仪器编号")
+    private String dvcd;
+    @ApiModelProperty("经度")
+    private BigDecimal eslg;
+    @ApiModelProperty("纬度")
+    private BigDecimal nrlt;
+    @ApiModelProperty("备注")
+    private String rm;
+
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSectionB.java

@@ -0,0 +1,38 @@
+package com.hnac.hzims.damsafety.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * 大坝断面信息表
+ */
+@Data
+@TableName("wrp_section_b")
+@EqualsAndHashCode(callSuper = true)
+public class WrpSectionB extends BaseEntity {
+    @ApiModelProperty("水库编号")
+    private String rscd;
+    @ApiModelProperty("建筑物id")
+    private Long buildingId;
+    @ApiModelProperty("断面编码")
+    private String damcd;
+    @ApiModelProperty("断面名称")
+    private String damnm;
+    @ApiModelProperty("防渗墙类型")
+    private String wallType;
+    @ApiModelProperty("断面长度")
+    private BigDecimal damlen;
+    @ApiModelProperty("断面宽度")
+    private BigDecimal damwd;
+    @ApiModelProperty("备注")
+    private String rm;
+    @ApiModelProperty("预留字段")
+    private String text;
+    @ApiModelProperty("图片地址")
+    private String attach;
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSpgPztb.java

@@ -0,0 +1,57 @@
+package com.hnac.hzims.damsafety.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * 测压管测点
+ */
+@Data
+@TableName("wrp_spg_pztb")
+@EqualsAndHashCode(callSuper = true)
+public class WrpSpgPztb extends BaseEntity {
+    @ApiModelProperty("测站编码")
+    private String stcd;
+    @ApiModelProperty("测点编号")
+    private String mpcd;
+    @ApiModelProperty("断面编号")
+    private String damcd;
+    @ApiModelProperty("桩号")
+    private String ch;
+    @ApiModelProperty("坝轴距")
+    private BigDecimal ofax;
+    @ApiModelProperty("监测部位")
+    private String msps;
+
+    @ApiModelProperty("监测类型")
+    private String mstp;
+    @ApiModelProperty("安装高程")
+    private BigDecimal el;
+    @ApiModelProperty("进水段底高程")
+    private BigDecimal ipbtel;
+    @ApiModelProperty("进水段顶高程")
+    private BigDecimal iptpel;
+    @ApiModelProperty("管口高程")
+    private BigDecimal tbtpel;
+    @ApiModelProperty("管底高程")
+    private BigDecimal tbbtel;
+    @ApiModelProperty("水位阈值高程")
+    private BigDecimal pztbtel;
+
+    @ApiModelProperty("仪器编号")
+    private String dvcd;
+    @ApiModelProperty("经度")
+    private BigDecimal eslg;
+    @ApiModelProperty("纬度")
+    private BigDecimal nrlt;
+    @ApiModelProperty("备注")
+    private String rm;
+
+
+
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSpgSpprmp.java

@@ -0,0 +1,52 @@
+package com.hnac.hzims.damsafety.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 渗流压力测点信息表
+ */
+@Data
+@TableName("wrp_spg_spprmp")
+@EqualsAndHashCode(callSuper = true)
+public class WrpSpgSpprmp extends BaseEntity {
+    @ApiModelProperty("测站编码")
+    private String stcd;
+    @ApiModelProperty("断面编码")
+    private String damcd;
+    @ApiModelProperty("测点编号")
+    private String mpcd;
+    @ApiModelProperty("考证信息日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date txindt;
+    @ApiModelProperty("桩号")
+    private String ch;
+    @ApiModelProperty("轴距")
+    private BigDecimal ofax;
+    @ApiModelProperty("高程")
+    private BigDecimal el;
+    @ApiModelProperty("监测类型")
+    private String mstp;
+    @ApiModelProperty("透水段底高程")
+    private BigDecimal pmbtel;
+    @ApiModelProperty("透水段顶高程")
+    private BigDecimal pmtpel;
+    @ApiModelProperty("安装日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date indt;
+    @ApiModelProperty("仪器出厂编号")
+    private String dvfccd;
+    @ApiModelProperty("工作状态")
+    private String wkcn;
+    @ApiModelProperty("备注")
+    private String rm;
+
+
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSpgSpqnmp.java

@@ -0,0 +1,45 @@
+package com.hnac.hzims.damsafety.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 渗流量测点
+ */
+@Data
+@TableName("wrp_spg_spqnmp")
+@EqualsAndHashCode(callSuper = true)
+public class WrpSpgSpqnmp extends BaseEntity {
+    @ApiModelProperty("测站编码")
+    private String stcd;
+    @ApiModelProperty("测点编号")
+    private String mpcd;
+    @ApiModelProperty("断面编号")
+    private String damcd;
+    @ApiModelProperty("桩号")
+    private String ch;
+    @ApiModelProperty("轴距")
+    private BigDecimal ofax;
+    @ApiModelProperty("高程")
+    private BigDecimal el;
+    @ApiModelProperty("渗流阈值")
+    private BigDecimal spprwl;
+    @ApiModelProperty("安装日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date indt;
+    @ApiModelProperty("仪器编号")
+    private String dvcd;
+    @ApiModelProperty("经度")
+    private BigDecimal eslg;
+    @ApiModelProperty("纬度")
+    private BigDecimal nrlt;
+    @ApiModelProperty("备注")
+    private String rm;
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/feign/IWrpSectionBClient.java

@@ -0,0 +1,31 @@
+package com.hnac.hzims.damsafety.feign;
+
+import com.hnac.hzims.damsafety.vo.WrpSectionBVO;
+import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData;
+import org.springblade.core.tool.api.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(
+        value = "dam-safety",
+        url = "${feign.dam-safety:}"
+)
+public interface IWrpSectionBClient {
+    String API_PREFIX = "/wrpSectionBClient";
+    String LIST = API_PREFIX + "/list";
+    String GET_REAL_DATA = API_PREFIX + "/getRealData";
+
+    /**
+     * 获取断面列表
+     *
+     * @return
+     */
+    @GetMapping(LIST)
+    R<List<WrpSectionBVO>> list(Map<String, Object> param);
+
+    @GetMapping(GET_REAL_DATA)
+    R<List<FieldsData>> getRealData(String deviceCode);
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/TBuildingVo.java

@@ -0,0 +1,8 @@
+package com.hnac.hzims.damsafety.vo;
+
+
+import com.hnac.hzims.damsafety.entity.TBuilding;
+
+public class TBuildingVo extends TBuilding {
+
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/TProjInfoVo.java

@@ -0,0 +1,8 @@
+package com.hnac.hzims.damsafety.vo;
+
+
+import com.hnac.hzims.damsafety.entity.TProjInfo;
+
+public class TProjInfoVo extends TProjInfo {
+
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpDfrSrhrdsmpVo.java

@@ -0,0 +1,7 @@
+package com.hnac.hzims.damsafety.vo;
+
+import com.hnac.hzims.damsafety.entity.WrpDfrSrhrdsmp;
+
+public class WrpDfrSrhrdsmpVo extends WrpDfrSrhrdsmp {
+
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpDfrSrvrdsbpVo.java

@@ -0,0 +1,7 @@
+package com.hnac.hzims.damsafety.vo;
+
+
+import com.hnac.hzims.damsafety.entity.WrpDfrSrvrdsbp;
+
+public class WrpDfrSrvrdsbpVo extends WrpDfrSrvrdsbp {
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpDfrSrvrdsmpVo.java

@@ -0,0 +1,7 @@
+package com.hnac.hzims.damsafety.vo;
+
+
+import com.hnac.hzims.damsafety.entity.WrpDfrSrvrdsmp;
+
+public class WrpDfrSrvrdsmpVo extends WrpDfrSrvrdsmp {
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSectionBVO.java

@@ -0,0 +1,16 @@
+package com.hnac.hzims.damsafety.vo;
+
+import com.hnac.hzims.damsafety.entity.WrpDfrSrvrdsbp;
+import com.hnac.hzims.damsafety.entity.WrpSectionB;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WrpSectionBVO extends WrpSectionB {
+    //测点集合
+    private List<WrpDfrSrvrdsbp> points;
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSpgPztbVo.java

@@ -0,0 +1,7 @@
+package com.hnac.hzims.damsafety.vo;
+
+
+import com.hnac.hzims.damsafety.entity.WrpSpgPztb;
+
+public class WrpSpgPztbVo extends WrpSpgPztb {
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSpgSpprmpVo.java

@@ -0,0 +1,7 @@
+package com.hnac.hzims.damsafety.vo;
+
+
+import com.hnac.hzims.damsafety.entity.WrpSpgSpprmp;
+
+public class WrpSpgSpprmpVo extends WrpSpgSpprmp {
+}

hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSpgSpqnmpVo.java

@@ -0,0 +1,7 @@
+package com.hnac.hzims.damsafety.vo;
+
+
+import com.hnac.hzims.damsafety.entity.WrpSpgSpqnmp;
+
+public class WrpSpgSpqnmpVo extends WrpSpgSpqnmp {
+}

hzims-service-api/digital-twin-display-api/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.hnac.hzims</groupId>
+        <artifactId>hzims-service-api</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
+    </parent>
+
+
+    <artifactId>digital-twin-display-api</artifactId>
+    <packaging>jar</packaging>
+    <version>${hzims.project.version}</version>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/entity/EmInfoEntity.java

@@ -248,4 +248,8 @@ public class EmInfoEntity extends TenantEntity {
 	@ApiModelProperty(value = "子设备")
 	@TableField(exist = false)
 	private List<EmInfoEntity> infoChildren;
+
+
+	@ApiModelProperty("固定资产编码")
+	private String assetCode;
 }

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/feign/IFdpMonitorClient.java

@@ -32,7 +32,7 @@ public interface IFdpMonitorClient {
 	R<List<String>> getRealIds();
 
 	@GetMapping(GET_FAULT_LIST)
-	String getFaultList();
+	String getFaultList(List<String> stations);
 
 	@GetMapping(UPDATE_FAULT_STATE)
 	String updateFaultState(UpdateFaultStateVo state);

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/feign/IFdpMonitorClientFallBack.java

@@ -24,7 +24,7 @@ public class IFdpMonitorClientFallBack implements IFdpMonitorClient{
 	}
 
 	@Override
-	public String getFaultList() {
+	public String getFaultList(List<String> stations) {
 		return null;
 	}
 

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/AreaAssetDeviceVo.java

@@ -0,0 +1,27 @@
+package com.hnac.hzims.operational.census.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author ysj
+ * @date 2023/8/29 11:22:22
+ * @version 4.0.0
+ */
+@Data
+public class AreaAssetDeviceVo {
+
+    @ApiModelProperty(value = "机构Id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "设备名称")
+    private String deviceCode;
+
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/AreaAssetVo.java

@@ -0,0 +1,24 @@
+package com.hnac.hzims.operational.census.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author ysj
+ * @date 2023/8/29 11:22:22
+ * @version 4.0.0
+ */
+@Data
+public class AreaAssetVo {
+
+    @ApiModelProperty(value = "机构Id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "机构名称")
+    private String deptName;
+
+    @ApiModelProperty(value = "设备集合")
+    private List<AreaAssetDeviceVo> devices;
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/AreaTimelyVo.java

@@ -0,0 +1,31 @@
+package com.hnac.hzims.operational.census.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author ysj
+ * @date 2023/8/29 11:22:22
+ * @version 4.0.0
+ */
+@Data
+public class AreaTimelyVo {
+
+    @ApiModelProperty(value = "机构名称")
+    private String deptName;
+
+    @ApiModelProperty(value = "事件Id")
+    private String eventId;
+
+    @ApiModelProperty(value = "事件内容")
+    private String content;
+
+    @ApiModelProperty(value = "事件time")
+    private String time;
+
+    @ApiModelProperty(value = "提醒数量")
+    private Integer sum;
+
+    @ApiModelProperty(value = "字体颜色：1-红色 0-黄色")
+    private Integer colour;
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/feign/StatisticsFeignClient.java

@@ -0,0 +1,39 @@
+package com.hnac.hzims.operational.defect.feign;
+
+import com.hnac.hzims.operational.OperationalConstants;
+import com.hnac.hzims.operational.defect.vo.OperDefectStatisticsVO;
+import com.hnac.hzims.operational.defect.vo.StatistictCountVo;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.tool.api.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import java.util.List;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/25 15:36
+ */
+@FeignClient(
+        value = OperationalConstants.APP_NAME,
+        fallback = StatisticsFeignClientFallback.class
+)
+public interface StatisticsFeignClient {
+
+
+    @GetMapping("/defect_statistic/list")
+    R<BladePage<OperDefectStatisticsVO>> list(@SpringQueryMap OperDefectStatisticsVO entity);
+
+
+
+    /**
+     * 巡检任务统计
+     * @return
+     */
+    @GetMapping("/defect_statistic/defectStatistictCount")
+    public  R<List<StatistictCountVo>> defectStatistictCount();
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/feign/StatisticsFeignClientFallback.java

@@ -0,0 +1,34 @@
+package com.hnac.hzims.operational.defect.feign;
+
+import com.hnac.hzims.operational.defect.vo.OperDefectStatisticsVO;
+import com.hnac.hzims.operational.defect.vo.StatistictCountVo;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/25 15:40
+ */
+@Component
+public class StatisticsFeignClientFallback implements StatisticsFeignClient {
+    @Override
+    public R<BladePage<OperDefectStatisticsVO>> list(OperDefectStatisticsVO entity) {
+        throw new ServiceException("熔断错误");
+    }
+
+    /**
+     * 巡检任务统计
+     *
+     * @return
+     */
+    @Override
+    public R<List<StatistictCountVo>> defectStatistictCount() {
+        return null;
+    }
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/vo/StatistictCount.java

@@ -0,0 +1,24 @@
+package com.hnac.hzims.operational.defect.vo;
+
+import lombok.Data;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/25 16:46
+ */
+@Data
+public class StatistictCount {
+
+
+    private String createDept;
+
+
+    private Integer count;
+
+
+    private Integer handleStatus;
+
+
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/vo/StatistictCountVo.java

@@ -0,0 +1,35 @@
+package com.hnac.hzims.operational.defect.vo;
+
+import lombok.Data;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/25 17:03
+ */
+@Data
+public class StatistictCountVo {
+
+
+    private String createDept;
+
+
+
+    private String createDeptName;
+
+
+    /**
+     * 已处理
+     */
+    private Integer processedCount = 0;
+
+
+    /**
+     * 未处理
+     */
+
+    private Integer untreatedCount = 0;
+
+
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/Estimate.java

@@ -0,0 +1,62 @@
+package com.hnac.hzims.operational.station.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 总体评分附表
+ * </p>
+ *
+ * @author dfy
+ * @since 2023-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("estimate")
+public class Estimate implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 基本条件
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 0 为选择 1 为选中
+     */
+    @TableField("checked")
+    private Boolean checked;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 逻辑删除
+     */
+    @TableField("is_deleted")
+    @TableLogic
+    private Boolean deleted;
+
+
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/EvaluationDetails.java

@@ -0,0 +1,80 @@
+package com.hnac.hzims.operational.station.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 得分事项简述
+ * </p>
+ *
+ * @author dfy
+ * @since 2023-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("evaluation_details")
+public class EvaluationDetails implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 电站评分id
+     */
+    @TableField("station_evaluation_id")
+    private Long stationEvaluationId;
+
+    /**
+     * 选择题目
+     */
+    @TableField("title")
+    private String title;
+
+    /**
+     * 是否选中 1 选中 0 不选中
+     */
+    @TableField("checked")
+    private Boolean checked;
+
+    /**
+     * 分数
+     */
+    @TableField("grade")
+    private Integer grade;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 逻辑删除
+     */
+    @TableField("is_deleted")
+    private Boolean deleted;
+
+
+
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/EvaluationDetailsOption.java

@@ -0,0 +1,78 @@
+package com.hnac.hzims.operational.station.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 选择表
+ * </p>
+ *
+ * @author dfy
+ * @since 2023-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("evaluation_details_option")
+public class EvaluationDetailsOption implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 题目
+     */
+    @TableField("option_title")
+    private String optionTitle;
+
+    /**
+     * 是否选中 1 选中 0 不选中
+     */
+    @TableField("option_checked")
+    private Boolean optionChecked;
+
+    /**
+     * 分数
+     */
+    @TableField("option_grade")
+    private Integer optionGrade;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 逻辑删除
+     */
+    @TableField("is_deleted")
+    private Boolean deleted;
+
+
+
+    @TableField("evaluation_details_id")
+    private Long evaluationDetailsId;
+
+
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/FileStation.java

@@ -0,0 +1,62 @@
+package com.hnac.hzims.operational.station.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 文件
+ *
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/8 16:01
+ */
+@Data
+@Accessors(chain = true)
+@TableName("file_station")
+public class FileStation implements Serializable {
+
+
+    /**
+     * 视频Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+
+    /**
+     * '视频地址'
+     */
+    private String file;
+
+
+    /**
+     * 站点Id
+     */
+    private Long stationId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 逻辑删除0 正常 1 删除
+     */
+    @TableLogic
+    private int isDeleted;
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/ImageStation.java

@@ -0,0 +1,62 @@
+package com.hnac.hzims.operational.station.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 图片
+ *
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/8 16:01
+ */
+@Data
+@Accessors(chain = true)
+@TableName("image_station")
+public class ImageStation implements Serializable {
+
+
+    /**
+     * 视频Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+
+    /**
+     * '视频地址'
+     */
+    private String image;
+
+
+    /**
+     * 站点Id
+     */
+    private Long stationId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 逻辑删除0 正常 1 删除
+     */
+    @TableLogic
+    private int isDeleted;
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEvaluation.java

@@ -0,0 +1,97 @@
+package com.hnac.hzims.operational.station.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 电站评分表
+ * </p>
+ *
+ * @author dfy
+ * @since 2023-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("station_evaluation")
+public class StationEvaluation implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 类别
+     */
+    @TableField("evaluation_name")
+    private String evaluationName;
+
+    /**
+     * 站点id
+     */
+    @TableField("station_id")
+    private Long stationId;
+
+    /**
+     * 父级
+     */
+    @TableField("parent_id")
+    private Long parentId;
+
+    /**
+     * 等级
+     */
+    @TableField("level")
+    private Integer level;
+
+    /**
+     * 分数
+     */
+    @TableField("minute")
+    private Integer minute;
+
+    /**
+     * 得分
+     */
+    @TableField("score")
+    private Integer score;
+
+    /**
+     * 描述
+     */
+    @TableField("description")
+    private String description;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 逻辑删除
+     */
+    @TableField("is_deleted")
+    private Boolean deleted;
+
+
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/VideoStation.java

@@ -0,0 +1,62 @@
+package com.hnac.hzims.operational.station.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 视频
+ *
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/8 16:01
+ */
+@Data
+@Accessors(chain = true)
+@TableName("video_station")
+public class VideoStation implements Serializable {
+
+
+    /**
+     * 视频Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+
+    /**
+     * '视频地址'
+     */
+    private String video;
+
+
+    /**
+     * 站点Id
+     */
+    private Long stationId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 逻辑删除0 正常 1 删除
+     */
+    @TableLogic
+    private int isDeleted;
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/vo/EvaluationDetailsOptionVo.java

@@ -0,0 +1,45 @@
+package com.hnac.hzims.operational.station.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/17 11:08
+ */
+@Data
+public class EvaluationDetailsOptionVo {
+
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 题目
+     */
+    @TableField("option_title")
+    private String optionTitle;
+
+    /**
+     * 是否选中 1 选中 0 不选中
+     */
+    @TableField("option_checked")
+    private Boolean optionChecked;
+
+    /**
+     * 分数
+     */
+    @TableField("option_grade")
+    private Integer optionGrade;
+
+
+    private Long evaluationDetailsId;
+
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/vo/EvaluationDetailsVo.java

@@ -0,0 +1,53 @@
+package com.hnac.hzims.operational.station.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/17 11:06
+ */
+@Data
+public class EvaluationDetailsVo {
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 电站评分id
+     */
+    @TableField("station_evaluation_id")
+    private Long stationEvaluationId;
+
+    /**
+     * 选择题目
+     */
+    @TableField("title")
+    private String title;
+
+    /**
+     * 是否选中 1 选中 0 不选中
+     */
+    @TableField("checked")
+    private Boolean checked;
+
+    /**
+     * 分数
+     */
+    @TableField("grade")
+    private Integer grade;
+
+    /**
+     * 封装选择项
+     */
+    private List<EvaluationDetailsOptionVo> evaluationDetailsOptionVos;
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/vo/OneStationEvaluationVo.java

@@ -0,0 +1,63 @@
+package com.hnac.hzims.operational.station.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/17 10:43
+ */
+@Data
+public class OneStationEvaluationVo {
+
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 类别
+     */
+    private String evaluationName;
+
+    /**
+     * 站点id
+     */
+
+    private Long stationId;
+
+    /**
+     * 父级
+     */
+
+    private Long parentId;
+
+    /**
+     * 等级
+     */
+    private Integer level;
+
+    /**
+     * 分数
+     */
+    private Integer minute;
+
+    /**
+     * 得分
+     */
+    private Integer score;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+
+    /**
+     * 封装第二级参数
+     */
+    private List<TwoStationEvaluationVo> children;
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/vo/StationsQueryVo.java

@@ -0,0 +1,20 @@
+package com.hnac.hzims.operational.station.vo;
+
+import com.baomidou.mybatisplus.annotation.SqlCondition;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.core.mp.support.QueryField;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/22 14:05
+ */
+@Data
+public class StationsQueryVo {
+
+    @ApiModelProperty("行政区划（来源于平台的行政区划表）")
+    @QueryField(condition = SqlCondition.EQUAL)
+    private String areaCode;
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/vo/StationsVo.java

@@ -0,0 +1,22 @@
+package com.hnac.hzims.operational.station.vo;
+
+import lombok.Data;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/22 9:39
+ */
+@Data
+public class StationsVo {
+
+
+    /**
+     * 电站名称
+     */
+    private Integer year;
+
+
+    private Integer count;
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/vo/ThreeStationEvaluationVo.java

@@ -0,0 +1,64 @@
+package com.hnac.hzims.operational.station.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/17 10:59
+ */
+@Data
+public class ThreeStationEvaluationVo {
+
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 类别
+     */
+    private String evaluationName;
+
+    /**
+     * 站点id
+     */
+
+    private Long stationId;
+
+    /**
+     * 父级
+     */
+
+    private Long parentId;
+
+    /**
+     * 等级
+     */
+    private Integer level;
+
+    /**
+     * 分数
+     */
+    private Integer minute;
+
+    /**
+     * 得分
+     */
+    private Integer score;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+
+    /**
+     * 封装简述参数
+     */
+    private List<EvaluationDetailsVo> evaluationDetailsVos;
+
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/vo/TwoStationEvaluationVo.java

@@ -0,0 +1,64 @@
+package com.hnac.hzims.operational.station.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/17 10:58
+ */
+@Data
+public class TwoStationEvaluationVo {
+
+
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 类别
+     */
+    private String evaluationName;
+
+    /**
+     * 站点id
+     */
+
+    private Long stationId;
+
+    /**
+     * 父级
+     */
+
+    private Long parentId;
+
+    /**
+     * 等级
+     */
+    private Integer level;
+
+    /**
+     * 分数
+     */
+    private Integer minute;
+
+    /**
+     * 得分
+     */
+    private Integer score;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+
+    /**
+     * 封装第三级参数
+     */
+    private List<ThreeStationEvaluationVo> children;
+}

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/areamonthly/feign/TaskFeignClient.java

@@ -1,19 +1,24 @@
 package com.hnac.hzinfo.inspect.areamonthly.feign;
 
-import com.hnac.hzinfo.inspect.areamonthly.feign.fallback.TaskFeignClientFallback;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hnac.hzims.vo.VoteChartVo;
+
+import com.hnac.hzinfo.inspect.areamonthly.vo.EventListVO;
 import com.hnac.hzinfo.inspect.areamonthly.vo.TaskListQuery;
+import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO;
 import com.hnac.hzinfo.inspect.areamonthly.vo.TaskVo;
 import com.hnac.hzinfo.inspect.task.entity.TaskEntity;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
+
-import org.springframework.web.bind.annotation.RequestParam;
+import java.util.List;
 
 import static com.hnac.hzinfo.inspect.Constants.APP_NAME;
 
@@ -23,27 +28,50 @@ import static com.hnac.hzinfo.inspect.Constants.APP_NAME;
  * @Serial 1.0
  * @Date 2023/4/11 17:21
  */
-@FeignClient(value = APP_NAME, fallback = TaskFeignClientFallback.class)
+@FeignClient(value = APP_NAME)
 public interface TaskFeignClient {
 
 
     @GetMapping("/task/list")
     @ApiOperation(value = "分页显示任务列表", notes = "传入task")
-    public R<BladePage<TaskVo>> list(@SpringQueryMap  TaskListQuery task,@SpringQueryMap Query query);
+    public R<BladePage<TaskVo>> list(@SpringQueryMap TaskListQuery task, @SpringQueryMap Query query);
 
     @GetMapping(value = "/task/detail")
     @ApiOperation(value = "查看,下面列表再调用eventController.list", notes = "传入taskid")
     public R<TaskEntity> detail(@RequestParam Long id);
 
 
-
     /**
      * 巡检任务分页
      */
     @GetMapping("/task/pageList/{page}/{size}")
     @ApiOperation(value = "分页显示任务列表", notes = "传入task")
     public R<BladePage<TaskVo>> pageList(
-            @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page,
+            @PathVariable("page") Long page,
-            @ApiParam(name = "size", value = "每页记录数", required = true) @PathVariable("size") Long size,
+             @PathVariable("size") Long size,
             @SpringQueryMap TaskListQuery task);
+
+
+    @GetMapping(value = "/task/event/list")
+    @ApiOperation(value = "任务查看弹窗下面的列表  巡检情况列表信息分页", notes = "传入taskId")
+    public R<BladePage<EventListVO>> eventList(@RequestParam Long taskId, @SpringQueryMap Query query,
+                                               @SpringQueryMap BladeUser bladeUser);
+
+
+    /**
+     * 获取任务详情
+     */
+    @GetMapping(value = "/task/getTaskById")
+    @ApiOperation(value = "获取任务详情", notes = "传入taskId")
+    public R<List<TaskObjectVO>> getTaskById(@RequestParam Long id);
+
+
+    /**
+     * 巡检计划统计
+     */
+    @GetMapping("task/getTaskListStatistics")
+    @ApiOperation(value = "巡检计划统计", notes = "传入计划id")
+    public R<List<VoteChartVo>> getTaskListStatistics(@RequestParam String startTime,@RequestParam  String endTime,
+                                                      @RequestParam Long deptId);
+
 }

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/areamonthly/feign/fallback/TaskFeignClientFallback.java

@@ -1,46 +1,80 @@
-package com.hnac.hzinfo.inspect.areamonthly.feign.fallback;
+// package com.hnac.hzinfo.inspect.areamonthly.feign.fallback;
-
+//
-import com.baomidou.mybatisplus.core.metadata.IPage;
+// import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.hnac.hzinfo.inspect.areamonthly.feign.TaskFeignClient;
+// import com.hnac.hzims.vo.VoteChartVo;
-import com.hnac.hzinfo.inspect.areamonthly.vo.TaskListQuery;
+// import com.hnac.hzinfo.inspect.areamonthly.feign.TaskFeignClient;
-import com.hnac.hzinfo.inspect.areamonthly.vo.TaskVo;
+// import com.hnac.hzinfo.inspect.areamonthly.vo.EventListVO;
-import com.hnac.hzinfo.inspect.task.entity.TaskEntity;
+// import com.hnac.hzinfo.inspect.areamonthly.vo.TaskListQuery;
-import lombok.extern.slf4j.Slf4j;
+// import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO;
-import org.springblade.core.mp.support.BladePage;
+// import com.hnac.hzinfo.inspect.areamonthly.vo.TaskVo;
-import org.springblade.core.mp.support.Query;
+// import com.hnac.hzinfo.inspect.task.entity.TaskEntity;
-import org.springblade.core.tool.api.R;
+// import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
+// import org.springblade.core.mp.support.BladePage;
-
+// import org.springblade.core.mp.support.Query;
-/**
+// import org.springblade.core.secure.BladeUser;
- * @Author WL
+// import org.springblade.core.tool.api.R;
- * @Version v1.0
+// import org.springframework.stereotype.Service;
- * @Serial 1.0
+//
- * @Date 2023/4/11 17:23
+// import java.util.List;
- */
+//
-@Slf4j
+// /**
-@Service
+//  * @Author WL
-public class TaskFeignClientFallback  implements TaskFeignClient {
+//  * @Version v1.0
-    @Override
+//  * @Serial 1.0
-    public R<BladePage<TaskVo>> list(TaskListQuery task, Query query) {
+//  * @Date 2023/4/11 17:23
-
+//  */
-        return R.fail("远程调用失败");
+// @Slf4j
-    }
+// @Service
-
+// public class TaskFeignClientFallback  implements TaskFeignClient {
-    @Override
+//     @Override
-    public R<TaskEntity> detail(Long id) {
+//     public R<BladePage<TaskVo>> list(TaskListQuery task, Query query) {
-        return R.fail("远程调用失败");
+//
-    }
+//         return R.fail("远程调用失败");
-
+//     }
-    /**
+//
-     * 巡检任务分页
+//     @Override
-     *
+//     public R<TaskEntity> detail(Long id) {
-     * @param page
+//         return R.fail("远程调用失败");
-     * @param size
+//     }
-     * @param task
+//
-     */
+//     /**
-    @Override
+//      * 巡检任务分页
-    public R<BladePage<TaskVo>> pageList(Long page, Long size, TaskListQuery task) {
+//      *
-        return R.fail("远程调用失败");
+//      * @param page
-    }
+//      * @param size
-
+//      * @param task
-}
+//      */
+//     @Override
+//     public R<BladePage<TaskVo>> pageList(Long page, Long size, TaskListQuery task) {
+//         return R.fail("远程调用失败");
+//     }
+//
+//
+//     @Override
+//     public R<BladePage<EventListVO>> eventList(Long taskId, Query query, BladeUser bladeUser) {
+//         return R.fail("远程调用失败");
+//     }
+//
+//     /**
+//      * 获取任务详情
+//      *
+//      * @param id
+//      */
+//     @Override
+//     public R<List<TaskObjectVO>> getTaskById(Long id) {
+//         return R.fail("远程调用失败");
+//     }
+//
+//     /**
+//      * 巡检计划统计
+//      *
+//      * @param startTime
+//      * @param endTime
+//      * @param deptId
+//      */
+//     @Override
+//     public R<List<VoteChartVo>> getTaskListStatistics(String startTime, String endTime, Long deptId) {
+//         return R.fail("远程调用失败");
+//     }
+//
+// }

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/areamonthly/vo/EventListVO.java

@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.task.vo;
+package com.hnac.hzinfo.inspect.areamonthly.vo;
 
 import java.io.Serializable;
 import java.util.Date;

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/areamonthly/vo/TaskObjectProjectContentVO.java

@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.task.vo;
+package com.hnac.hzinfo.inspect.areamonthly.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/areamonthly/vo/TaskObjectProjectOfflineVO.java

@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.task.vo;
+package com.hnac.hzinfo.inspect.areamonthly.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/areamonthly/vo/TaskObjectProjectVO.java

@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.task.vo;
+package com.hnac.hzinfo.inspect.areamonthly.vo;
 
 import com.google.common.collect.Lists;
 import io.swagger.annotations.ApiModel;

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/areamonthly/vo/TaskObjectVO.java

@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.task.vo;
+package com.hnac.hzinfo.inspect.areamonthly.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.google.common.collect.Lists;

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/feign/IInspectTaskClient.java

@@ -20,6 +20,8 @@ public interface IInspectTaskClient {
 	String QUERY_BY_PLAN_START_TIME_AND_DEPT = API_PREFIX + "/queryByPlanStartTimeAndDept";
 	String GET_INSPECT_TASK_CHECK = API_PREFIX + "/getInspectTaskCheck";
 
+	String EXPIRE_INSPECT = API_PREFIX + "/expireInspect";
+
 	/**
 	 * 根据创建时间查询巡检任务列表
 	 **/
@@ -40,9 +42,20 @@ public interface IInspectTaskClient {
 	 * @param inspectType 查询类型 1：为运行人员 2：管理及其他人员
 	 * @return
 	 */
-	@GetMapping(GET_INSPECT_TASK_CHECK)
+	@GetMapping(EXPIRE_INSPECT)
 	R<SafeCheckStatisticVO> getInspectTaskCheck(@RequestParam("startDate") String startDate,
 												@RequestParam("endDate") String endDate,
 												@RequestParam("dept") Long dept,
 												@RequestParam("inspectType") String inspectType);
+
+	/**
+	 * 查询到期巡检
+	 * @param start
+	 * @param end
+	 * @param deptId
+	 * @return
+	 */
+	@GetMapping(EXPIRE_INSPECT)
+	List<TaskEntity> expireInspect(@RequestParam("start") String start, @RequestParam("end") String end,@RequestParam("deptId")Long deptId);
+
 }

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/feign/IInspectTaskClientBack.java

@@ -28,4 +28,9 @@ public class IInspectTaskClientBack implements IInspectTaskClient {
 	public R<SafeCheckStatisticVO> getInspectTaskCheck(String startDate, String endDate, Long dept, String inspectType) {
 		return R.data(new SafeCheckStatisticVO());
 	}
+
+	@Override
+	public List<TaskEntity> expireInspect(String start, String end, Long deptId) {
+		return new ArrayList<>();
+	}
 }

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/threedimensional/fallback/RouteFeignClientFallback.java

@@ -0,0 +1,63 @@
+package com.hnac.hzinfo.inspect.threedimensional.fallback;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hnac.hzinfo.inspect.plan.entity.RouteEntity;
+import com.hnac.hzinfo.inspect.threedimensional.fegin.RouteFeignClient;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/25 8:57
+ */
+@Component
+public class RouteFeignClientFallback  implements RouteFeignClient {
+    /**
+     * 查询巡检路径管理列表
+     *
+     * @param st_re_route
+     * @param query
+     * @return
+     */
+    @Override
+    public R<BladePage<RouteEntity>> list(Map<String, Object> st_re_route, Query query) {
+        throw  new ServiceException("熔断错误");
+    }
+
+    /**
+     * 新增 代码自定义代号
+     *
+     * @param st_re_route
+     */
+    @Override
+    public R save(RouteEntity st_re_route) {
+        throw  new ServiceException("熔断错误");
+    }
+
+    /**
+     * 修改 代码自定义代号
+     *
+     * @param st_re_route
+     */
+    @Override
+    public R update(RouteEntity st_re_route) {
+        throw  new ServiceException("熔断错误");
+    }
+
+    /**
+     * 删除 代码自定义代号
+     *
+     * @param ids
+     */
+    @Override
+    public R remove(String ids) {
+        throw  new ServiceException("熔断错误");
+    }
+}

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/threedimensional/fegin/RouteFeignClient.java

@@ -0,0 +1,73 @@
+package com.hnac.hzinfo.inspect.threedimensional.fegin;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzinfo.inspect.Constants;
+import com.hnac.hzinfo.inspect.plan.entity.RouteEntity;
+import com.hnac.hzinfo.inspect.threedimensional.fallback.RouteFeignClientFallback;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
+import java.util.Map;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/25 8:55
+ */
+@FeignClient(value = Constants.APP_NAME)
+public interface RouteFeignClient {
+
+
+    /**
+     * 查询巡检路径管理列表
+     *
+     * @param st_re_route
+     * @param query
+     * @return
+     */
+    @GetMapping("/st_re_route/list")
+    public R<BladePage<RouteEntity>> list(@ApiIgnore @RequestParam Map<String, Object> st_re_route,
+                                          @SpringQueryMap Query query);
+
+
+    /**
+     * 新增 代码自定义代号
+     */
+    @PostMapping("/st_re_route/save")
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "新增", notes = "传入st_re_route")
+    public R save(@RequestBody RouteEntity st_re_route);
+
+
+    /**
+     * 修改 代码自定义代号
+     */
+    @PostMapping("/st_re_route/update")
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "修改", notes = "传入st_re_route")
+    public R update(@RequestBody RouteEntity st_re_route);
+
+
+    /**
+     * 删除 代码自定义代号
+     */
+    @PostMapping("/st_re_route/remove")
+    @ApiOperationSupport(order = 7)
+    @ApiOperation(value = "逻辑删除", notes = "传入ids")
+    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
+}

hzims-service-api/middle-api/.gitignore

@@ -0,0 +1,38 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store

hzims-service-api/pom.xml

@@ -27,6 +27,12 @@
         <module>weather-api</module>
         <module>common-api</module>
         <module>middle-api</module>
+        <module>base-info-api</module>
+        <module>digital-twin-display-api</module>
+        <module>dam-safety-api</module>
+        <module>video-image-api</module>
+        <module>water-quality-api</module>
+        <module>water-rain-api</module>
     </modules>
 
     <dependencies>

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/hiddendanger/entity/HiddenDanger.java

@@ -0,0 +1,30 @@
+package com.hnac.hzims.safeproduct.hiddendanger.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hidden_danger")
+public class HiddenDanger {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 危险行为
+     */
+    @TableField("danger_behavior")
+    private String dangerBehavior;
+
+    /**
+     * 发生次数
+     */
+    @TableField("times")
+    private Integer times;
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/hiddendanger/vo/HiddenDangerQueryVo.java

@@ -0,0 +1,13 @@
+package com.hnac.hzims.safeproduct.hiddendanger.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+@Data
+public class HiddenDangerQueryVo {
+    /**
+     * 危险行为
+     */
+    @TableField("danger_behavior")
+    private String dangerBehavior;
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/management/entity/DocumentManagement.java

@@ -0,0 +1,74 @@
+package com.hnac.hzims.safeproduct.management.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 文档管理
+ * </p>
+ *
+ * @author dfy
+ * @since 2023-08-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("document_management")
+public class DocumentManagement implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 文档名称
+     */
+    @TableField("document_name")
+    private String documentName;
+
+    /**
+     * 文档路径
+     */
+    @TableField("document_url")
+    private String documentUrl;
+
+    /**
+     * 创建人Id
+     */
+    @TableField("creator_id")
+    private Long creatorId;
+
+    /**
+     * 创建人名称
+     */
+    @TableField("creator_name")
+    private String creatorName;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 逻辑删除
+     */
+    @TableLogic
+    @TableField("is_deleted")
+    private Integer isDeleted;
+
+
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/management/entity/IndicatorManagement.java

@@ -0,0 +1,77 @@
+package com.hnac.hzims.safeproduct.management.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 指标项管理
+ * </p>
+ *
+ * @author dfy
+ * @since 2023-08-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("indicator_management")
+public class IndicatorManagement implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 项目名称
+     */
+    @TableField("product_name")
+    private String productName;
+
+    /**
+     * 标准分值
+     */
+    @TableField("standard_score")
+    private String standardScore;
+
+    /**
+     * 评审方法及评分标准
+     */
+    @TableField("evaluation_method")
+    private String evaluationMethod;
+
+    /**
+     * 指标管理id
+     */
+    @TableField("target_management_id")
+    private Long targetManagementId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 逻辑删除
+     */
+    @TableLogic
+    @TableField("is_deleted")
+    private Boolean deleted;
+
+
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/management/entity/RatingScale.java

@@ -0,0 +1,71 @@
+package com.hnac.hzims.safeproduct.management.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 平分表
+ * </p>
+ *
+ * @author dfy
+ * @since 2023-08-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("rating_scale")
+public class RatingScale implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 指标项管理id
+     */
+    @TableField("indicator_management_id")
+    private Long indicatorManagementId;
+
+    /**
+     * 得分
+     */
+    @TableField("goal")
+    private String goal;
+
+    /**
+     * 评审描述
+     */
+    @TableField("review_description")
+    private String reviewDescription;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 逻辑删除
+     */
+    @TableLogic
+    @TableField("is_deleted")
+    private Boolean deleted;
+
+
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/management/entity/TargetManagement.java

@@ -0,0 +1,81 @@
+package com.hnac.hzims.safeproduct.management.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 指标管理
+ * </p>
+ *
+ * @author dfy
+ * @since 2023-08-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("target_management")
+public class TargetManagement implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 分值
+     */
+    @TableField("score")
+    private String score;
+
+    /**
+     * 父级Id
+     */
+    @TableField("parent_id")
+    private Long parentId;
+
+    /**
+     * 等级
+     */
+    @TableField("level")
+    private Integer level;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 逻辑删除
+     */
+    @TableLogic
+    @TableField("is_deleted")
+    private Boolean deleted;
+
+
+    @TableField(exist = false)
+    private List<TargetManagement> children;
+
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/management/vo/DocumentManagementQueryVo.java

@@ -0,0 +1,20 @@
+package com.hnac.hzims.safeproduct.management.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/11 16:46
+ */
+@Data
+public class DocumentManagementQueryVo {
+
+    /**
+     * 文档名称
+     */
+    @TableField("document_name")
+    private String documentName;
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/management/vo/IndicatorManagementQueryVo.java

@@ -0,0 +1,36 @@
+package com.hnac.hzims.safeproduct.management.vo;
+
+import lombok.Data;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/11 10:22
+ */
+@Data
+public class IndicatorManagementQueryVo {
+
+
+    /**
+     * 指标管理id
+     */
+    private Long targetManagementId;
+
+
+    /**
+     * 项目名称
+     */
+    private String productName;
+
+
+    /**
+     * 开始时间
+     */
+    private  String startTime;
+
+    /**
+     * 结束时间
+     */
+    private  String endTime;
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/management/vo/IndicatorManagementResponseVo.java

@@ -0,0 +1,32 @@
+package com.hnac.hzims.safeproduct.management.vo;
+
+import com.hnac.hzims.safeproduct.management.entity.IndicatorManagement;
+import lombok.Data;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/8/11 10:32
+ */
+@Data
+public class IndicatorManagementResponseVo extends IndicatorManagement {
+
+    /**
+     * 名称
+     */
+    private String name;
+
+
+    /**
+     * 得分
+     */
+    private String goal;
+
+    /**
+     * 评审描述
+     */
+    private String reviewDescription;
+
+
+}