diff --git a/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java b/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java index 7fae2b4..b258d29 100644 --- a/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java +++ b/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java @@ -37,8 +37,8 @@ import java.util.Map; * @date 2023/3/29 * @description: 操作日志切面处理类 */ -@Aspect -@Component +//@Aspect +//@Component @Slf4j public class SysLogAspect { diff --git a/hzims-service-api/base-info-api/pom.xml b/hzims-service-api/base-info-api/pom.xml deleted file mode 100644 index 3fcd836..0000000 --- a/hzims-service-api/base-info-api/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - - com.hnac.hzims - hzims-service-api - 4.0.0-SNAPSHOT - - - - base-info-api - ${hzims.project.version} - jar - - - 8 - 8 - UTF-8 - - - \ No newline at end of file diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/FileReservoirInfo.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/FileReservoirInfo.java deleted file mode 100644 index 379d842..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/FileReservoirInfo.java +++ /dev/null @@ -1,65 +0,0 @@ -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; -} diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ImageReservoirInfo.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ImageReservoirInfo.java deleted file mode 100644 index 687249f..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ImageReservoirInfo.java +++ /dev/null @@ -1,62 +0,0 @@ -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; -} diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/IrrBIReach.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/IrrBIReach.java deleted file mode 100644 index 2513e9f..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/IrrBIReach.java +++ /dev/null @@ -1,62 +0,0 @@ -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; - } - -} \ No newline at end of file diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/IrrBIReachExample.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/IrrBIReachExample.java deleted file mode 100644 index 888d33a..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/IrrBIReachExample.java +++ /dev/null @@ -1,531 +0,0 @@ -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 oredCriteria; - - public IrrBIReachExample() { - oredCriteria = new ArrayList(); - } - - 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 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 criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List 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 values) { - addCriterion("RIVER_CODE in", values, "riverCode"); - return (Criteria) this; - } - - public Criteria andRiverCodeNotIn(List 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 values) { - addCriterion("RIVER_NAME in", values, "riverName"); - return (Criteria) this; - } - - public Criteria andRiverNameNotIn(List 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 values) { - addCriterion("RIVER_WIDTH in", values, "riverWidth"); - return (Criteria) this; - } - - public Criteria andRiverWidthNotIn(List 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 values) { - addCriterion("RIVER_FLUX in", values, "riverFlux"); - return (Criteria) this; - } - - public Criteria andRiverFluxNotIn(List 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 values) { - addCriterion("COORDINATESET in", values, "coordinateset"); - return (Criteria) this; - } - - public Criteria andCoordinatesetNotIn(List 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); - } - } -} \ No newline at end of file diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirInfo.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirInfo.java deleted file mode 100644 index c8af1b7..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirInfo.java +++ /dev/null @@ -1,408 +0,0 @@ -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; - } - -} \ No newline at end of file diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirInfoExample.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirInfoExample.java deleted file mode 100644 index 51e78e3..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirInfoExample.java +++ /dev/null @@ -1,2358 +0,0 @@ -package com.hnac.hzims.baseinfo.entity; - -import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; -import java.util.List; - -public class ReservoirInfoExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public ReservoirInfoExample() { - oredCriteria = new ArrayList(); - } - - 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 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 criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List 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)); - } - - protected void addCriterionForJDBCDate(String condition, Date value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - addCriterion(condition, new java.sql.Date(value.getTime()), property); - } - - protected void addCriterionForJDBCDate(String condition, List values, String property) { - if (values == null || values.size() == 0) { - throw new RuntimeException("Value list for " + property + " cannot be null or empty"); - } - List dateList = new ArrayList(); - Iterator iter = values.iterator(); - while (iter.hasNext()) { - dateList.add(new java.sql.Date(iter.next().getTime())); - } - addCriterion(condition, dateList, property); - } - - protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property); - } - - 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 values) { - addCriterion("STCD in", values, "stcd"); - return (Criteria) this; - } - - public Criteria andStcdNotIn(List 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 andStationidIsNull() { - addCriterion("STATIONID is null"); - return (Criteria) this; - } - - public Criteria andStationidIsNotNull() { - addCriterion("STATIONID is not null"); - return (Criteria) this; - } - - public Criteria andStationidEqualTo(String value) { - addCriterion("STATIONID =", value, "stationid"); - return (Criteria) this; - } - - public Criteria andStationidNotEqualTo(String value) { - addCriterion("STATIONID <>", value, "stationid"); - return (Criteria) this; - } - - public Criteria andStationidGreaterThan(String value) { - addCriterion("STATIONID >", value, "stationid"); - return (Criteria) this; - } - - public Criteria andStationidGreaterThanOrEqualTo(String value) { - addCriterion("STATIONID >=", value, "stationid"); - return (Criteria) this; - } - - public Criteria andStationidLessThan(String value) { - addCriterion("STATIONID <", value, "stationid"); - return (Criteria) this; - } - - public Criteria andStationidLessThanOrEqualTo(String value) { - addCriterion("STATIONID <=", value, "stationid"); - return (Criteria) this; - } - - public Criteria andStationidLike(String value) { - addCriterion("STATIONID like", value, "stationid"); - return (Criteria) this; - } - - public Criteria andStationidNotLike(String value) { - addCriterion("STATIONID not like", value, "stationid"); - return (Criteria) this; - } - - public Criteria andStationidIn(List values) { - addCriterion("STATIONID in", values, "stationid"); - return (Criteria) this; - } - - public Criteria andStationidNotIn(List values) { - addCriterion("STATIONID not in", values, "stationid"); - return (Criteria) this; - } - - public Criteria andStationidBetween(String value1, String value2) { - addCriterion("STATIONID between", value1, value2, "stationid"); - return (Criteria) this; - } - - public Criteria andStationidNotBetween(String value1, String value2) { - addCriterion("STATIONID not between", value1, value2, "stationid"); - return (Criteria) this; - } - - public Criteria andDischargeIsNull() { - addCriterion("DISCHARGE is null"); - return (Criteria) this; - } - - public Criteria andDischargeIsNotNull() { - addCriterion("DISCHARGE is not null"); - return (Criteria) this; - } - - public Criteria andDischargeEqualTo(Float value) { - addCriterion("DISCHARGE =", value, "discharge"); - return (Criteria) this; - } - - public Criteria andDischargeNotEqualTo(Float value) { - addCriterion("DISCHARGE <>", value, "discharge"); - return (Criteria) this; - } - - public Criteria andDischargeGreaterThan(Float value) { - addCriterion("DISCHARGE >", value, "discharge"); - return (Criteria) this; - } - - public Criteria andDischargeGreaterThanOrEqualTo(Float value) { - addCriterion("DISCHARGE >=", value, "discharge"); - return (Criteria) this; - } - - public Criteria andDischargeLessThan(Float value) { - addCriterion("DISCHARGE <", value, "discharge"); - return (Criteria) this; - } - - public Criteria andDischargeLessThanOrEqualTo(Float value) { - addCriterion("DISCHARGE <=", value, "discharge"); - return (Criteria) this; - } - - public Criteria andDischargeIn(List values) { - addCriterion("DISCHARGE in", values, "discharge"); - return (Criteria) this; - } - - public Criteria andDischargeNotIn(List values) { - addCriterion("DISCHARGE not in", values, "discharge"); - return (Criteria) this; - } - - public Criteria andDischargeBetween(Float value1, Float value2) { - addCriterion("DISCHARGE between", value1, value2, "discharge"); - return (Criteria) this; - } - - public Criteria andDischargeNotBetween(Float value1, Float value2) { - addCriterion("DISCHARGE not between", value1, value2, "discharge"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("NAME is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("NAME is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("NAME =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("NAME <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("NAME >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("NAME >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("NAME <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("NAME <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("NAME like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("NAME not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("NAME in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("NAME not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("NAME between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("NAME not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andLocationIsNull() { - addCriterion("LOCATION is null"); - return (Criteria) this; - } - - public Criteria andLocationIsNotNull() { - addCriterion("LOCATION is not null"); - return (Criteria) this; - } - - public Criteria andLocationEqualTo(String value) { - addCriterion("LOCATION =", value, "location"); - return (Criteria) this; - } - - public Criteria andLocationNotEqualTo(String value) { - addCriterion("LOCATION <>", value, "location"); - return (Criteria) this; - } - - public Criteria andLocationGreaterThan(String value) { - addCriterion("LOCATION >", value, "location"); - return (Criteria) this; - } - - public Criteria andLocationGreaterThanOrEqualTo(String value) { - addCriterion("LOCATION >=", value, "location"); - return (Criteria) this; - } - - public Criteria andLocationLessThan(String value) { - addCriterion("LOCATION <", value, "location"); - return (Criteria) this; - } - - public Criteria andLocationLessThanOrEqualTo(String value) { - addCriterion("LOCATION <=", value, "location"); - return (Criteria) this; - } - - public Criteria andLocationLike(String value) { - addCriterion("LOCATION like", value, "location"); - return (Criteria) this; - } - - public Criteria andLocationNotLike(String value) { - addCriterion("LOCATION not like", value, "location"); - return (Criteria) this; - } - - public Criteria andLocationIn(List values) { - addCriterion("LOCATION in", values, "location"); - return (Criteria) this; - } - - public Criteria andLocationNotIn(List values) { - addCriterion("LOCATION not in", values, "location"); - return (Criteria) this; - } - - public Criteria andLocationBetween(String value1, String value2) { - addCriterion("LOCATION between", value1, value2, "location"); - return (Criteria) this; - } - - public Criteria andLocationNotBetween(String value1, String value2) { - addCriterion("LOCATION not between", value1, value2, "location"); - return (Criteria) this; - } - - public Criteria andVillageIsNull() { - addCriterion("VILLAGE is null"); - return (Criteria) this; - } - - public Criteria andVillageIsNotNull() { - addCriterion("VILLAGE is not null"); - return (Criteria) this; - } - - public Criteria andVillageEqualTo(String value) { - addCriterion("VILLAGE =", value, "village"); - return (Criteria) this; - } - - public Criteria andVillageNotEqualTo(String value) { - addCriterion("VILLAGE <>", value, "village"); - return (Criteria) this; - } - - public Criteria andVillageGreaterThan(String value) { - addCriterion("VILLAGE >", value, "village"); - return (Criteria) this; - } - - public Criteria andVillageGreaterThanOrEqualTo(String value) { - addCriterion("VILLAGE >=", value, "village"); - return (Criteria) this; - } - - public Criteria andVillageLessThan(String value) { - addCriterion("VILLAGE <", value, "village"); - return (Criteria) this; - } - - public Criteria andVillageLessThanOrEqualTo(String value) { - addCriterion("VILLAGE <=", value, "village"); - return (Criteria) this; - } - - public Criteria andVillageLike(String value) { - addCriterion("VILLAGE like", value, "village"); - return (Criteria) this; - } - - public Criteria andVillageNotLike(String value) { - addCriterion("VILLAGE not like", value, "village"); - return (Criteria) this; - } - - public Criteria andVillageIn(List values) { - addCriterion("VILLAGE in", values, "village"); - return (Criteria) this; - } - - public Criteria andVillageNotIn(List values) { - addCriterion("VILLAGE not in", values, "village"); - return (Criteria) this; - } - - public Criteria andVillageBetween(String value1, String value2) { - addCriterion("VILLAGE between", value1, value2, "village"); - return (Criteria) this; - } - - public Criteria andVillageNotBetween(String value1, String value2) { - addCriterion("VILLAGE not between", value1, value2, "village"); - return (Criteria) this; - } - - public Criteria andRoadlengthIsNull() { - addCriterion("ROADLENGTH is null"); - return (Criteria) this; - } - - public Criteria andRoadlengthIsNotNull() { - addCriterion("ROADLENGTH is not null"); - return (Criteria) this; - } - - public Criteria andRoadlengthEqualTo(Float value) { - addCriterion("ROADLENGTH =", value, "roadlength"); - return (Criteria) this; - } - - public Criteria andRoadlengthNotEqualTo(Float value) { - addCriterion("ROADLENGTH <>", value, "roadlength"); - return (Criteria) this; - } - - public Criteria andRoadlengthGreaterThan(Float value) { - addCriterion("ROADLENGTH >", value, "roadlength"); - return (Criteria) this; - } - - public Criteria andRoadlengthGreaterThanOrEqualTo(Float value) { - addCriterion("ROADLENGTH >=", value, "roadlength"); - return (Criteria) this; - } - - public Criteria andRoadlengthLessThan(Float value) { - addCriterion("ROADLENGTH <", value, "roadlength"); - return (Criteria) this; - } - - public Criteria andRoadlengthLessThanOrEqualTo(Float value) { - addCriterion("ROADLENGTH <=", value, "roadlength"); - return (Criteria) this; - } - - public Criteria andRoadlengthIn(List values) { - addCriterion("ROADLENGTH in", values, "roadlength"); - return (Criteria) this; - } - - public Criteria andRoadlengthNotIn(List values) { - addCriterion("ROADLENGTH not in", values, "roadlength"); - return (Criteria) this; - } - - public Criteria andRoadlengthBetween(Float value1, Float value2) { - addCriterion("ROADLENGTH between", value1, value2, "roadlength"); - return (Criteria) this; - } - - public Criteria andRoadlengthNotBetween(Float value1, Float value2) { - addCriterion("ROADLENGTH not between", value1, value2, "roadlength"); - return (Criteria) this; - } - - public Criteria andRoadconditiionIsNull() { - addCriterion("ROADCONDITIION is null"); - return (Criteria) this; - } - - public Criteria andRoadconditiionIsNotNull() { - addCriterion("ROADCONDITIION is not null"); - return (Criteria) this; - } - - public Criteria andRoadconditiionEqualTo(String value) { - addCriterion("ROADCONDITIION =", value, "roadconditiion"); - return (Criteria) this; - } - - public Criteria andRoadconditiionNotEqualTo(String value) { - addCriterion("ROADCONDITIION <>", value, "roadconditiion"); - return (Criteria) this; - } - - public Criteria andRoadconditiionGreaterThan(String value) { - addCriterion("ROADCONDITIION >", value, "roadconditiion"); - return (Criteria) this; - } - - public Criteria andRoadconditiionGreaterThanOrEqualTo(String value) { - addCriterion("ROADCONDITIION >=", value, "roadconditiion"); - return (Criteria) this; - } - - public Criteria andRoadconditiionLessThan(String value) { - addCriterion("ROADCONDITIION <", value, "roadconditiion"); - return (Criteria) this; - } - - public Criteria andRoadconditiionLessThanOrEqualTo(String value) { - addCriterion("ROADCONDITIION <=", value, "roadconditiion"); - return (Criteria) this; - } - - public Criteria andRoadconditiionLike(String value) { - addCriterion("ROADCONDITIION like", value, "roadconditiion"); - return (Criteria) this; - } - - public Criteria andRoadconditiionNotLike(String value) { - addCriterion("ROADCONDITIION not like", value, "roadconditiion"); - return (Criteria) this; - } - - public Criteria andRoadconditiionIn(List values) { - addCriterion("ROADCONDITIION in", values, "roadconditiion"); - return (Criteria) this; - } - - public Criteria andRoadconditiionNotIn(List values) { - addCriterion("ROADCONDITIION not in", values, "roadconditiion"); - return (Criteria) this; - } - - public Criteria andRoadconditiionBetween(String value1, String value2) { - addCriterion("ROADCONDITIION between", value1, value2, "roadconditiion"); - return (Criteria) this; - } - - public Criteria andRoadconditiionNotBetween(String value1, String value2) { - addCriterion("ROADCONDITIION not between", value1, value2, "roadconditiion"); - return (Criteria) this; - } - - public Criteria andBuilddateIsNull() { - addCriterion("BUILDDATE is null"); - return (Criteria) this; - } - - public Criteria andBuilddateIsNotNull() { - addCriterion("BUILDDATE is not null"); - return (Criteria) this; - } - - public Criteria andBuilddateEqualTo(Date value) { - addCriterionForJDBCDate("BUILDDATE =", value, "builddate"); - return (Criteria) this; - } - - public Criteria andBuilddateNotEqualTo(Date value) { - addCriterionForJDBCDate("BUILDDATE <>", value, "builddate"); - return (Criteria) this; - } - - public Criteria andBuilddateGreaterThan(Date value) { - addCriterionForJDBCDate("BUILDDATE >", value, "builddate"); - return (Criteria) this; - } - - public Criteria andBuilddateGreaterThanOrEqualTo(Date value) { - addCriterionForJDBCDate("BUILDDATE >=", value, "builddate"); - return (Criteria) this; - } - - public Criteria andBuilddateLessThan(Date value) { - addCriterionForJDBCDate("BUILDDATE <", value, "builddate"); - return (Criteria) this; - } - - public Criteria andBuilddateLessThanOrEqualTo(Date value) { - addCriterionForJDBCDate("BUILDDATE <=", value, "builddate"); - return (Criteria) this; - } - - public Criteria andBuilddateIn(List values) { - addCriterionForJDBCDate("BUILDDATE in", values, "builddate"); - return (Criteria) this; - } - - public Criteria andBuilddateNotIn(List values) { - addCriterionForJDBCDate("BUILDDATE not in", values, "builddate"); - return (Criteria) this; - } - - public Criteria andBuilddateBetween(Date value1, Date value2) { - addCriterionForJDBCDate("BUILDDATE between", value1, value2, "builddate"); - return (Criteria) this; - } - - public Criteria andBuilddateNotBetween(Date value1, Date value2) { - addCriterionForJDBCDate("BUILDDATE not between", value1, value2, "builddate"); - return (Criteria) this; - } - - public Criteria andCompleteddateIsNull() { - addCriterion("COMPLETEDDATE is null"); - return (Criteria) this; - } - - public Criteria andCompleteddateIsNotNull() { - addCriterion("COMPLETEDDATE is not null"); - return (Criteria) this; - } - - public Criteria andCompleteddateEqualTo(Date value) { - addCriterionForJDBCDate("COMPLETEDDATE =", value, "completeddate"); - return (Criteria) this; - } - - public Criteria andCompleteddateNotEqualTo(Date value) { - addCriterionForJDBCDate("COMPLETEDDATE <>", value, "completeddate"); - return (Criteria) this; - } - - public Criteria andCompleteddateGreaterThan(Date value) { - addCriterionForJDBCDate("COMPLETEDDATE >", value, "completeddate"); - return (Criteria) this; - } - - public Criteria andCompleteddateGreaterThanOrEqualTo(Date value) { - addCriterionForJDBCDate("COMPLETEDDATE >=", value, "completeddate"); - return (Criteria) this; - } - - public Criteria andCompleteddateLessThan(Date value) { - addCriterionForJDBCDate("COMPLETEDDATE <", value, "completeddate"); - return (Criteria) this; - } - - public Criteria andCompleteddateLessThanOrEqualTo(Date value) { - addCriterionForJDBCDate("COMPLETEDDATE <=", value, "completeddate"); - return (Criteria) this; - } - - public Criteria andCompleteddateIn(List values) { - addCriterionForJDBCDate("COMPLETEDDATE in", values, "completeddate"); - return (Criteria) this; - } - - public Criteria andCompleteddateNotIn(List values) { - addCriterionForJDBCDate("COMPLETEDDATE not in", values, "completeddate"); - return (Criteria) this; - } - - public Criteria andCompleteddateBetween(Date value1, Date value2) { - addCriterionForJDBCDate("COMPLETEDDATE between", value1, value2, "completeddate"); - return (Criteria) this; - } - - public Criteria andCompleteddateNotBetween(Date value1, Date value2) { - addCriterionForJDBCDate("COMPLETEDDATE not between", value1, value2, "completeddate"); - return (Criteria) this; - } - - public Criteria andRainareaIsNull() { - addCriterion("RAINAREA is null"); - return (Criteria) this; - } - - public Criteria andRainareaIsNotNull() { - addCriterion("RAINAREA is not null"); - return (Criteria) this; - } - - public Criteria andRainareaEqualTo(Float value) { - addCriterion("RAINAREA =", value, "rainarea"); - return (Criteria) this; - } - - public Criteria andRainareaNotEqualTo(Float value) { - addCriterion("RAINAREA <>", value, "rainarea"); - return (Criteria) this; - } - - public Criteria andRainareaGreaterThan(Float value) { - addCriterion("RAINAREA >", value, "rainarea"); - return (Criteria) this; - } - - public Criteria andRainareaGreaterThanOrEqualTo(Float value) { - addCriterion("RAINAREA >=", value, "rainarea"); - return (Criteria) this; - } - - public Criteria andRainareaLessThan(Float value) { - addCriterion("RAINAREA <", value, "rainarea"); - return (Criteria) this; - } - - public Criteria andRainareaLessThanOrEqualTo(Float value) { - addCriterion("RAINAREA <=", value, "rainarea"); - return (Criteria) this; - } - - public Criteria andRainareaIn(List values) { - addCriterion("RAINAREA in", values, "rainarea"); - return (Criteria) this; - } - - public Criteria andRainareaNotIn(List values) { - addCriterion("RAINAREA not in", values, "rainarea"); - return (Criteria) this; - } - - public Criteria andRainareaBetween(Float value1, Float value2) { - addCriterion("RAINAREA between", value1, value2, "rainarea"); - return (Criteria) this; - } - - public Criteria andRainareaNotBetween(Float value1, Float value2) { - addCriterion("RAINAREA not between", value1, value2, "rainarea"); - return (Criteria) this; - } - - public Criteria andDesignedfloodflowIsNull() { - addCriterion("DESIGNEDFLOODFLOW is null"); - return (Criteria) this; - } - - public Criteria andDesignedfloodflowIsNotNull() { - addCriterion("DESIGNEDFLOODFLOW is not null"); - return (Criteria) this; - } - - public Criteria andDesignedfloodflowEqualTo(Float value) { - addCriterion("DESIGNEDFLOODFLOW =", value, "designedfloodflow"); - return (Criteria) this; - } - - public Criteria andDesignedfloodflowNotEqualTo(Float value) { - addCriterion("DESIGNEDFLOODFLOW <>", value, "designedfloodflow"); - return (Criteria) this; - } - - public Criteria andDesignedfloodflowGreaterThan(Float value) { - addCriterion("DESIGNEDFLOODFLOW >", value, "designedfloodflow"); - return (Criteria) this; - } - - public Criteria andDesignedfloodflowGreaterThanOrEqualTo(Float value) { - addCriterion("DESIGNEDFLOODFLOW >=", value, "designedfloodflow"); - return (Criteria) this; - } - - public Criteria andDesignedfloodflowLessThan(Float value) { - addCriterion("DESIGNEDFLOODFLOW <", value, "designedfloodflow"); - return (Criteria) this; - } - - public Criteria andDesignedfloodflowLessThanOrEqualTo(Float value) { - addCriterion("DESIGNEDFLOODFLOW <=", value, "designedfloodflow"); - return (Criteria) this; - } - - public Criteria andDesignedfloodflowIn(List values) { - addCriterion("DESIGNEDFLOODFLOW in", values, "designedfloodflow"); - return (Criteria) this; - } - - public Criteria andDesignedfloodflowNotIn(List values) { - addCriterion("DESIGNEDFLOODFLOW not in", values, "designedfloodflow"); - return (Criteria) this; - } - - public Criteria andDesignedfloodflowBetween(Float value1, Float value2) { - addCriterion("DESIGNEDFLOODFLOW between", value1, value2, "designedfloodflow"); - return (Criteria) this; - } - - public Criteria andDesignedfloodflowNotBetween(Float value1, Float value2) { - addCriterion("DESIGNEDFLOODFLOW not between", value1, value2, "designedfloodflow"); - return (Criteria) this; - } - - public Criteria andChedkedfloodflowIsNull() { - addCriterion("CHEDKEDFLOODFLOW is null"); - return (Criteria) this; - } - - public Criteria andChedkedfloodflowIsNotNull() { - addCriterion("CHEDKEDFLOODFLOW is not null"); - return (Criteria) this; - } - - public Criteria andChedkedfloodflowEqualTo(Float value) { - addCriterion("CHEDKEDFLOODFLOW =", value, "chedkedfloodflow"); - return (Criteria) this; - } - - public Criteria andChedkedfloodflowNotEqualTo(Float value) { - addCriterion("CHEDKEDFLOODFLOW <>", value, "chedkedfloodflow"); - return (Criteria) this; - } - - public Criteria andChedkedfloodflowGreaterThan(Float value) { - addCriterion("CHEDKEDFLOODFLOW >", value, "chedkedfloodflow"); - return (Criteria) this; - } - - public Criteria andChedkedfloodflowGreaterThanOrEqualTo(Float value) { - addCriterion("CHEDKEDFLOODFLOW >=", value, "chedkedfloodflow"); - return (Criteria) this; - } - - public Criteria andChedkedfloodflowLessThan(Float value) { - addCriterion("CHEDKEDFLOODFLOW <", value, "chedkedfloodflow"); - return (Criteria) this; - } - - public Criteria andChedkedfloodflowLessThanOrEqualTo(Float value) { - addCriterion("CHEDKEDFLOODFLOW <=", value, "chedkedfloodflow"); - return (Criteria) this; - } - - public Criteria andChedkedfloodflowIn(List values) { - addCriterion("CHEDKEDFLOODFLOW in", values, "chedkedfloodflow"); - return (Criteria) this; - } - - public Criteria andChedkedfloodflowNotIn(List values) { - addCriterion("CHEDKEDFLOODFLOW not in", values, "chedkedfloodflow"); - return (Criteria) this; - } - - public Criteria andChedkedfloodflowBetween(Float value1, Float value2) { - addCriterion("CHEDKEDFLOODFLOW between", value1, value2, "chedkedfloodflow"); - return (Criteria) this; - } - - public Criteria andChedkedfloodflowNotBetween(Float value1, Float value2) { - addCriterion("CHEDKEDFLOODFLOW not between", value1, value2, "chedkedfloodflow"); - return (Criteria) this; - } - - public Criteria andDesignedfillareaIsNull() { - addCriterion("DESIGNEDFILLAREA is null"); - return (Criteria) this; - } - - public Criteria andDesignedfillareaIsNotNull() { - addCriterion("DESIGNEDFILLAREA is not null"); - return (Criteria) this; - } - - public Criteria andDesignedfillareaEqualTo(Float value) { - addCriterion("DESIGNEDFILLAREA =", value, "designedfillarea"); - return (Criteria) this; - } - - public Criteria andDesignedfillareaNotEqualTo(Float value) { - addCriterion("DESIGNEDFILLAREA <>", value, "designedfillarea"); - return (Criteria) this; - } - - public Criteria andDesignedfillareaGreaterThan(Float value) { - addCriterion("DESIGNEDFILLAREA >", value, "designedfillarea"); - return (Criteria) this; - } - - public Criteria andDesignedfillareaGreaterThanOrEqualTo(Float value) { - addCriterion("DESIGNEDFILLAREA >=", value, "designedfillarea"); - return (Criteria) this; - } - - public Criteria andDesignedfillareaLessThan(Float value) { - addCriterion("DESIGNEDFILLAREA <", value, "designedfillarea"); - return (Criteria) this; - } - - public Criteria andDesignedfillareaLessThanOrEqualTo(Float value) { - addCriterion("DESIGNEDFILLAREA <=", value, "designedfillarea"); - return (Criteria) this; - } - - public Criteria andDesignedfillareaIn(List values) { - addCriterion("DESIGNEDFILLAREA in", values, "designedfillarea"); - return (Criteria) this; - } - - public Criteria andDesignedfillareaNotIn(List values) { - addCriterion("DESIGNEDFILLAREA not in", values, "designedfillarea"); - return (Criteria) this; - } - - public Criteria andDesignedfillareaBetween(Float value1, Float value2) { - addCriterion("DESIGNEDFILLAREA between", value1, value2, "designedfillarea"); - return (Criteria) this; - } - - public Criteria andDesignedfillareaNotBetween(Float value1, Float value2) { - addCriterion("DESIGNEDFILLAREA not between", value1, value2, "designedfillarea"); - return (Criteria) this; - } - - public Criteria andDesignedtotalflowIsNull() { - addCriterion("DESIGNEDTOTALFLOW is null"); - return (Criteria) this; - } - - public Criteria andDesignedtotalflowIsNotNull() { - addCriterion("DESIGNEDTOTALFLOW is not null"); - return (Criteria) this; - } - - public Criteria andDesignedtotalflowEqualTo(Float value) { - addCriterion("DESIGNEDTOTALFLOW =", value, "designedtotalflow"); - return (Criteria) this; - } - - public Criteria andDesignedtotalflowNotEqualTo(Float value) { - addCriterion("DESIGNEDTOTALFLOW <>", value, "designedtotalflow"); - return (Criteria) this; - } - - public Criteria andDesignedtotalflowGreaterThan(Float value) { - addCriterion("DESIGNEDTOTALFLOW >", value, "designedtotalflow"); - return (Criteria) this; - } - - public Criteria andDesignedtotalflowGreaterThanOrEqualTo(Float value) { - addCriterion("DESIGNEDTOTALFLOW >=", value, "designedtotalflow"); - return (Criteria) this; - } - - public Criteria andDesignedtotalflowLessThan(Float value) { - addCriterion("DESIGNEDTOTALFLOW <", value, "designedtotalflow"); - return (Criteria) this; - } - - public Criteria andDesignedtotalflowLessThanOrEqualTo(Float value) { - addCriterion("DESIGNEDTOTALFLOW <=", value, "designedtotalflow"); - return (Criteria) this; - } - - public Criteria andDesignedtotalflowIn(List values) { - addCriterion("DESIGNEDTOTALFLOW in", values, "designedtotalflow"); - return (Criteria) this; - } - - public Criteria andDesignedtotalflowNotIn(List values) { - addCriterion("DESIGNEDTOTALFLOW not in", values, "designedtotalflow"); - return (Criteria) this; - } - - public Criteria andDesignedtotalflowBetween(Float value1, Float value2) { - addCriterion("DESIGNEDTOTALFLOW between", value1, value2, "designedtotalflow"); - return (Criteria) this; - } - - public Criteria andDesignedtotalflowNotBetween(Float value1, Float value2) { - addCriterion("DESIGNEDTOTALFLOW not between", value1, value2, "designedtotalflow"); - return (Criteria) this; - } - - public Criteria andChecdedtotalflowIsNull() { - addCriterion("CHECDEDTOTALFLOW is null"); - return (Criteria) this; - } - - public Criteria andChecdedtotalflowIsNotNull() { - addCriterion("CHECDEDTOTALFLOW is not null"); - return (Criteria) this; - } - - public Criteria andChecdedtotalflowEqualTo(Float value) { - addCriterion("CHECDEDTOTALFLOW =", value, "checdedtotalflow"); - return (Criteria) this; - } - - public Criteria andChecdedtotalflowNotEqualTo(Float value) { - addCriterion("CHECDEDTOTALFLOW <>", value, "checdedtotalflow"); - return (Criteria) this; - } - - public Criteria andChecdedtotalflowGreaterThan(Float value) { - addCriterion("CHECDEDTOTALFLOW >", value, "checdedtotalflow"); - return (Criteria) this; - } - - public Criteria andChecdedtotalflowGreaterThanOrEqualTo(Float value) { - addCriterion("CHECDEDTOTALFLOW >=", value, "checdedtotalflow"); - return (Criteria) this; - } - - public Criteria andChecdedtotalflowLessThan(Float value) { - addCriterion("CHECDEDTOTALFLOW <", value, "checdedtotalflow"); - return (Criteria) this; - } - - public Criteria andChecdedtotalflowLessThanOrEqualTo(Float value) { - addCriterion("CHECDEDTOTALFLOW <=", value, "checdedtotalflow"); - return (Criteria) this; - } - - public Criteria andChecdedtotalflowIn(List values) { - addCriterion("CHECDEDTOTALFLOW in", values, "checdedtotalflow"); - return (Criteria) this; - } - - public Criteria andChecdedtotalflowNotIn(List values) { - addCriterion("CHECDEDTOTALFLOW not in", values, "checdedtotalflow"); - return (Criteria) this; - } - - public Criteria andChecdedtotalflowBetween(Float value1, Float value2) { - addCriterion("CHECDEDTOTALFLOW between", value1, value2, "checdedtotalflow"); - return (Criteria) this; - } - - public Criteria andChecdedtotalflowNotBetween(Float value1, Float value2) { - addCriterion("CHECDEDTOTALFLOW not between", value1, value2, "checdedtotalflow"); - return (Criteria) this; - } - - public Criteria andAveragerainfallIsNull() { - addCriterion("AVERAGERAINFALL is null"); - return (Criteria) this; - } - - public Criteria andAveragerainfallIsNotNull() { - addCriterion("AVERAGERAINFALL is not null"); - return (Criteria) this; - } - - public Criteria andAveragerainfallEqualTo(Float value) { - addCriterion("AVERAGERAINFALL =", value, "averagerainfall"); - return (Criteria) this; - } - - public Criteria andAveragerainfallNotEqualTo(Float value) { - addCriterion("AVERAGERAINFALL <>", value, "averagerainfall"); - return (Criteria) this; - } - - public Criteria andAveragerainfallGreaterThan(Float value) { - addCriterion("AVERAGERAINFALL >", value, "averagerainfall"); - return (Criteria) this; - } - - public Criteria andAveragerainfallGreaterThanOrEqualTo(Float value) { - addCriterion("AVERAGERAINFALL >=", value, "averagerainfall"); - return (Criteria) this; - } - - public Criteria andAveragerainfallLessThan(Float value) { - addCriterion("AVERAGERAINFALL <", value, "averagerainfall"); - return (Criteria) this; - } - - public Criteria andAveragerainfallLessThanOrEqualTo(Float value) { - addCriterion("AVERAGERAINFALL <=", value, "averagerainfall"); - return (Criteria) this; - } - - public Criteria andAveragerainfallIn(List values) { - addCriterion("AVERAGERAINFALL in", values, "averagerainfall"); - return (Criteria) this; - } - - public Criteria andAveragerainfallNotIn(List values) { - addCriterion("AVERAGERAINFALL not in", values, "averagerainfall"); - return (Criteria) this; - } - - public Criteria andAveragerainfallBetween(Float value1, Float value2) { - addCriterion("AVERAGERAINFALL between", value1, value2, "averagerainfall"); - return (Criteria) this; - } - - public Criteria andAveragerainfallNotBetween(Float value1, Float value2) { - addCriterion("AVERAGERAINFALL not between", value1, value2, "averagerainfall"); - return (Criteria) this; - } - - public Criteria andDesignedmaxflowIsNull() { - addCriterion("DESIGNEDMAXFLOW is null"); - return (Criteria) this; - } - - public Criteria andDesignedmaxflowIsNotNull() { - addCriterion("DESIGNEDMAXFLOW is not null"); - return (Criteria) this; - } - - public Criteria andDesignedmaxflowEqualTo(Float value) { - addCriterion("DESIGNEDMAXFLOW =", value, "designedmaxflow"); - return (Criteria) this; - } - - public Criteria andDesignedmaxflowNotEqualTo(Float value) { - addCriterion("DESIGNEDMAXFLOW <>", value, "designedmaxflow"); - return (Criteria) this; - } - - public Criteria andDesignedmaxflowGreaterThan(Float value) { - addCriterion("DESIGNEDMAXFLOW >", value, "designedmaxflow"); - return (Criteria) this; - } - - public Criteria andDesignedmaxflowGreaterThanOrEqualTo(Float value) { - addCriterion("DESIGNEDMAXFLOW >=", value, "designedmaxflow"); - return (Criteria) this; - } - - public Criteria andDesignedmaxflowLessThan(Float value) { - addCriterion("DESIGNEDMAXFLOW <", value, "designedmaxflow"); - return (Criteria) this; - } - - public Criteria andDesignedmaxflowLessThanOrEqualTo(Float value) { - addCriterion("DESIGNEDMAXFLOW <=", value, "designedmaxflow"); - return (Criteria) this; - } - - public Criteria andDesignedmaxflowIn(List values) { - addCriterion("DESIGNEDMAXFLOW in", values, "designedmaxflow"); - return (Criteria) this; - } - - public Criteria andDesignedmaxflowNotIn(List values) { - addCriterion("DESIGNEDMAXFLOW not in", values, "designedmaxflow"); - return (Criteria) this; - } - - public Criteria andDesignedmaxflowBetween(Float value1, Float value2) { - addCriterion("DESIGNEDMAXFLOW between", value1, value2, "designedmaxflow"); - return (Criteria) this; - } - - public Criteria andDesignedmaxflowNotBetween(Float value1, Float value2) { - addCriterion("DESIGNEDMAXFLOW not between", value1, value2, "designedmaxflow"); - return (Criteria) this; - } - - public Criteria andCheckedmaxflowIsNull() { - addCriterion("CHECKEDMAXFLOW is null"); - return (Criteria) this; - } - - public Criteria andCheckedmaxflowIsNotNull() { - addCriterion("CHECKEDMAXFLOW is not null"); - return (Criteria) this; - } - - public Criteria andCheckedmaxflowEqualTo(Float value) { - addCriterion("CHECKEDMAXFLOW =", value, "checkedmaxflow"); - return (Criteria) this; - } - - public Criteria andCheckedmaxflowNotEqualTo(Float value) { - addCriterion("CHECKEDMAXFLOW <>", value, "checkedmaxflow"); - return (Criteria) this; - } - - public Criteria andCheckedmaxflowGreaterThan(Float value) { - addCriterion("CHECKEDMAXFLOW >", value, "checkedmaxflow"); - return (Criteria) this; - } - - public Criteria andCheckedmaxflowGreaterThanOrEqualTo(Float value) { - addCriterion("CHECKEDMAXFLOW >=", value, "checkedmaxflow"); - return (Criteria) this; - } - - public Criteria andCheckedmaxflowLessThan(Float value) { - addCriterion("CHECKEDMAXFLOW <", value, "checkedmaxflow"); - return (Criteria) this; - } - - public Criteria andCheckedmaxflowLessThanOrEqualTo(Float value) { - addCriterion("CHECKEDMAXFLOW <=", value, "checkedmaxflow"); - return (Criteria) this; - } - - public Criteria andCheckedmaxflowIn(List values) { - addCriterion("CHECKEDMAXFLOW in", values, "checkedmaxflow"); - return (Criteria) this; - } - - public Criteria andCheckedmaxflowNotIn(List values) { - addCriterion("CHECKEDMAXFLOW not in", values, "checkedmaxflow"); - return (Criteria) this; - } - - public Criteria andCheckedmaxflowBetween(Float value1, Float value2) { - addCriterion("CHECKEDMAXFLOW between", value1, value2, "checkedmaxflow"); - return (Criteria) this; - } - - public Criteria andCheckedmaxflowNotBetween(Float value1, Float value2) { - addCriterion("CHECKEDMAXFLOW not between", value1, value2, "checkedmaxflow"); - return (Criteria) this; - } - - public Criteria andVolumeIsNull() { - addCriterion("VOLUME is null"); - return (Criteria) this; - } - - public Criteria andVolumeIsNotNull() { - addCriterion("VOLUME is not null"); - return (Criteria) this; - } - - public Criteria andVolumeEqualTo(Float value) { - addCriterion("VOLUME =", value, "volume"); - return (Criteria) this; - } - - public Criteria andVolumeNotEqualTo(Float value) { - addCriterion("VOLUME <>", value, "volume"); - return (Criteria) this; - } - - public Criteria andVolumeGreaterThan(Float value) { - addCriterion("VOLUME >", value, "volume"); - return (Criteria) this; - } - - public Criteria andVolumeGreaterThanOrEqualTo(Float value) { - addCriterion("VOLUME >=", value, "volume"); - return (Criteria) this; - } - - public Criteria andVolumeLessThan(Float value) { - addCriterion("VOLUME <", value, "volume"); - return (Criteria) this; - } - - public Criteria andVolumeLessThanOrEqualTo(Float value) { - addCriterion("VOLUME <=", value, "volume"); - return (Criteria) this; - } - - public Criteria andVolumeIn(List values) { - addCriterion("VOLUME in", values, "volume"); - return (Criteria) this; - } - - public Criteria andVolumeNotIn(List values) { - addCriterion("VOLUME not in", values, "volume"); - return (Criteria) this; - } - - public Criteria andVolumeBetween(Float value1, Float value2) { - addCriterion("VOLUME between", value1, value2, "volume"); - return (Criteria) this; - } - - public Criteria andVolumeNotBetween(Float value1, Float value2) { - addCriterion("VOLUME not between", value1, value2, "volume"); - return (Criteria) this; - } - - public Criteria andCheckedfloodlevelIsNull() { - addCriterion("CHECKEDFLOODLEVEL is null"); - return (Criteria) this; - } - - public Criteria andCheckedfloodlevelIsNotNull() { - addCriterion("CHECKEDFLOODLEVEL is not null"); - return (Criteria) this; - } - - public Criteria andCheckedfloodlevelEqualTo(Float value) { - addCriterion("CHECKEDFLOODLEVEL =", value, "checkedfloodlevel"); - return (Criteria) this; - } - - public Criteria andCheckedfloodlevelNotEqualTo(Float value) { - addCriterion("CHECKEDFLOODLEVEL <>", value, "checkedfloodlevel"); - return (Criteria) this; - } - - public Criteria andCheckedfloodlevelGreaterThan(Float value) { - addCriterion("CHECKEDFLOODLEVEL >", value, "checkedfloodlevel"); - return (Criteria) this; - } - - public Criteria andCheckedfloodlevelGreaterThanOrEqualTo(Float value) { - addCriterion("CHECKEDFLOODLEVEL >=", value, "checkedfloodlevel"); - return (Criteria) this; - } - - public Criteria andCheckedfloodlevelLessThan(Float value) { - addCriterion("CHECKEDFLOODLEVEL <", value, "checkedfloodlevel"); - return (Criteria) this; - } - - public Criteria andCheckedfloodlevelLessThanOrEqualTo(Float value) { - addCriterion("CHECKEDFLOODLEVEL <=", value, "checkedfloodlevel"); - return (Criteria) this; - } - - public Criteria andCheckedfloodlevelIn(List values) { - addCriterion("CHECKEDFLOODLEVEL in", values, "checkedfloodlevel"); - return (Criteria) this; - } - - public Criteria andCheckedfloodlevelNotIn(List values) { - addCriterion("CHECKEDFLOODLEVEL not in", values, "checkedfloodlevel"); - return (Criteria) this; - } - - public Criteria andCheckedfloodlevelBetween(Float value1, Float value2) { - addCriterion("CHECKEDFLOODLEVEL between", value1, value2, "checkedfloodlevel"); - return (Criteria) this; - } - - public Criteria andCheckedfloodlevelNotBetween(Float value1, Float value2) { - addCriterion("CHECKEDFLOODLEVEL not between", value1, value2, "checkedfloodlevel"); - return (Criteria) this; - } - - public Criteria andHistoricalmaxlevelIsNull() { - addCriterion("HISTORICALMAXLEVEL is null"); - return (Criteria) this; - } - - public Criteria andHistoricalmaxlevelIsNotNull() { - addCriterion("HISTORICALMAXLEVEL is not null"); - return (Criteria) this; - } - - public Criteria andHistoricalmaxlevelEqualTo(Float value) { - addCriterion("HISTORICALMAXLEVEL =", value, "historicalmaxlevel"); - return (Criteria) this; - } - - public Criteria andHistoricalmaxlevelNotEqualTo(Float value) { - addCriterion("HISTORICALMAXLEVEL <>", value, "historicalmaxlevel"); - return (Criteria) this; - } - - public Criteria andHistoricalmaxlevelGreaterThan(Float value) { - addCriterion("HISTORICALMAXLEVEL >", value, "historicalmaxlevel"); - return (Criteria) this; - } - - public Criteria andHistoricalmaxlevelGreaterThanOrEqualTo(Float value) { - addCriterion("HISTORICALMAXLEVEL >=", value, "historicalmaxlevel"); - return (Criteria) this; - } - - public Criteria andHistoricalmaxlevelLessThan(Float value) { - addCriterion("HISTORICALMAXLEVEL <", value, "historicalmaxlevel"); - return (Criteria) this; - } - - public Criteria andHistoricalmaxlevelLessThanOrEqualTo(Float value) { - addCriterion("HISTORICALMAXLEVEL <=", value, "historicalmaxlevel"); - return (Criteria) this; - } - - public Criteria andHistoricalmaxlevelIn(List values) { - addCriterion("HISTORICALMAXLEVEL in", values, "historicalmaxlevel"); - return (Criteria) this; - } - - public Criteria andHistoricalmaxlevelNotIn(List values) { - addCriterion("HISTORICALMAXLEVEL not in", values, "historicalmaxlevel"); - return (Criteria) this; - } - - public Criteria andHistoricalmaxlevelBetween(Float value1, Float value2) { - addCriterion("HISTORICALMAXLEVEL between", value1, value2, "historicalmaxlevel"); - return (Criteria) this; - } - - public Criteria andHistoricalmaxlevelNotBetween(Float value1, Float value2) { - addCriterion("HISTORICALMAXLEVEL not between", value1, value2, "historicalmaxlevel"); - return (Criteria) this; - } - - public Criteria andFloodcontrolvolumeIsNull() { - addCriterion("FLOODCONTROLVOLUME is null"); - return (Criteria) this; - } - - public Criteria andFloodcontrolvolumeIsNotNull() { - addCriterion("FLOODCONTROLVOLUME is not null"); - return (Criteria) this; - } - - public Criteria andFloodcontrolvolumeEqualTo(Float value) { - addCriterion("FLOODCONTROLVOLUME =", value, "floodcontrolvolume"); - return (Criteria) this; - } - - public Criteria andFloodcontrolvolumeNotEqualTo(Float value) { - addCriterion("FLOODCONTROLVOLUME <>", value, "floodcontrolvolume"); - return (Criteria) this; - } - - public Criteria andFloodcontrolvolumeGreaterThan(Float value) { - addCriterion("FLOODCONTROLVOLUME >", value, "floodcontrolvolume"); - return (Criteria) this; - } - - public Criteria andFloodcontrolvolumeGreaterThanOrEqualTo(Float value) { - addCriterion("FLOODCONTROLVOLUME >=", value, "floodcontrolvolume"); - return (Criteria) this; - } - - public Criteria andFloodcontrolvolumeLessThan(Float value) { - addCriterion("FLOODCONTROLVOLUME <", value, "floodcontrolvolume"); - return (Criteria) this; - } - - public Criteria andFloodcontrolvolumeLessThanOrEqualTo(Float value) { - addCriterion("FLOODCONTROLVOLUME <=", value, "floodcontrolvolume"); - return (Criteria) this; - } - - public Criteria andFloodcontrolvolumeIn(List values) { - addCriterion("FLOODCONTROLVOLUME in", values, "floodcontrolvolume"); - return (Criteria) this; - } - - public Criteria andFloodcontrolvolumeNotIn(List values) { - addCriterion("FLOODCONTROLVOLUME not in", values, "floodcontrolvolume"); - return (Criteria) this; - } - - public Criteria andFloodcontrolvolumeBetween(Float value1, Float value2) { - addCriterion("FLOODCONTROLVOLUME between", value1, value2, "floodcontrolvolume"); - return (Criteria) this; - } - - public Criteria andFloodcontrolvolumeNotBetween(Float value1, Float value2) { - addCriterion("FLOODCONTROLVOLUME not between", value1, value2, "floodcontrolvolume"); - return (Criteria) this; - } - - public Criteria andDesignedfloodlevelIsNull() { - addCriterion("DESIGNEDFLOODLEVEL is null"); - return (Criteria) this; - } - - public Criteria andDesignedfloodlevelIsNotNull() { - addCriterion("DESIGNEDFLOODLEVEL is not null"); - return (Criteria) this; - } - - public Criteria andDesignedfloodlevelEqualTo(Float value) { - addCriterion("DESIGNEDFLOODLEVEL =", value, "designedfloodlevel"); - return (Criteria) this; - } - - public Criteria andDesignedfloodlevelNotEqualTo(Float value) { - addCriterion("DESIGNEDFLOODLEVEL <>", value, "designedfloodlevel"); - return (Criteria) this; - } - - public Criteria andDesignedfloodlevelGreaterThan(Float value) { - addCriterion("DESIGNEDFLOODLEVEL >", value, "designedfloodlevel"); - return (Criteria) this; - } - - public Criteria andDesignedfloodlevelGreaterThanOrEqualTo(Float value) { - addCriterion("DESIGNEDFLOODLEVEL >=", value, "designedfloodlevel"); - return (Criteria) this; - } - - public Criteria andDesignedfloodlevelLessThan(Float value) { - addCriterion("DESIGNEDFLOODLEVEL <", value, "designedfloodlevel"); - return (Criteria) this; - } - - public Criteria andDesignedfloodlevelLessThanOrEqualTo(Float value) { - addCriterion("DESIGNEDFLOODLEVEL <=", value, "designedfloodlevel"); - return (Criteria) this; - } - - public Criteria andDesignedfloodlevelIn(List values) { - addCriterion("DESIGNEDFLOODLEVEL in", values, "designedfloodlevel"); - return (Criteria) this; - } - - public Criteria andDesignedfloodlevelNotIn(List values) { - addCriterion("DESIGNEDFLOODLEVEL not in", values, "designedfloodlevel"); - return (Criteria) this; - } - - public Criteria andDesignedfloodlevelBetween(Float value1, Float value2) { - addCriterion("DESIGNEDFLOODLEVEL between", value1, value2, "designedfloodlevel"); - return (Criteria) this; - } - - public Criteria andDesignedfloodlevelNotBetween(Float value1, Float value2) { - addCriterion("DESIGNEDFLOODLEVEL not between", value1, value2, "designedfloodlevel"); - return (Criteria) this; - } - - public Criteria andMaxleveltimeIsNull() { - addCriterion("MAXLEVELTIME is null"); - return (Criteria) this; - } - - public Criteria andMaxleveltimeIsNotNull() { - addCriterion("MAXLEVELTIME is not null"); - return (Criteria) this; - } - - public Criteria andMaxleveltimeEqualTo(Date value) { - addCriterion("MAXLEVELTIME =", value, "maxleveltime"); - return (Criteria) this; - } - - public Criteria andMaxleveltimeNotEqualTo(Date value) { - addCriterion("MAXLEVELTIME <>", value, "maxleveltime"); - return (Criteria) this; - } - - public Criteria andMaxleveltimeGreaterThan(Date value) { - addCriterion("MAXLEVELTIME >", value, "maxleveltime"); - return (Criteria) this; - } - - public Criteria andMaxleveltimeGreaterThanOrEqualTo(Date value) { - addCriterion("MAXLEVELTIME >=", value, "maxleveltime"); - return (Criteria) this; - } - - public Criteria andMaxleveltimeLessThan(Date value) { - addCriterion("MAXLEVELTIME <", value, "maxleveltime"); - return (Criteria) this; - } - - public Criteria andMaxleveltimeLessThanOrEqualTo(Date value) { - addCriterion("MAXLEVELTIME <=", value, "maxleveltime"); - return (Criteria) this; - } - - public Criteria andMaxleveltimeIn(List values) { - addCriterion("MAXLEVELTIME in", values, "maxleveltime"); - return (Criteria) this; - } - - public Criteria andMaxleveltimeNotIn(List values) { - addCriterion("MAXLEVELTIME not in", values, "maxleveltime"); - return (Criteria) this; - } - - public Criteria andMaxleveltimeBetween(Date value1, Date value2) { - addCriterion("MAXLEVELTIME between", value1, value2, "maxleveltime"); - return (Criteria) this; - } - - public Criteria andMaxleveltimeNotBetween(Date value1, Date value2) { - addCriterion("MAXLEVELTIME not between", value1, value2, "maxleveltime"); - return (Criteria) this; - } - - public Criteria andUtilizablevolumeIsNull() { - addCriterion("UTILIZABLEVOLUME is null"); - return (Criteria) this; - } - - public Criteria andUtilizablevolumeIsNotNull() { - addCriterion("UTILIZABLEVOLUME is not null"); - return (Criteria) this; - } - - public Criteria andUtilizablevolumeEqualTo(Float value) { - addCriterion("UTILIZABLEVOLUME =", value, "utilizablevolume"); - return (Criteria) this; - } - - public Criteria andUtilizablevolumeNotEqualTo(Float value) { - addCriterion("UTILIZABLEVOLUME <>", value, "utilizablevolume"); - return (Criteria) this; - } - - public Criteria andUtilizablevolumeGreaterThan(Float value) { - addCriterion("UTILIZABLEVOLUME >", value, "utilizablevolume"); - return (Criteria) this; - } - - public Criteria andUtilizablevolumeGreaterThanOrEqualTo(Float value) { - addCriterion("UTILIZABLEVOLUME >=", value, "utilizablevolume"); - return (Criteria) this; - } - - public Criteria andUtilizablevolumeLessThan(Float value) { - addCriterion("UTILIZABLEVOLUME <", value, "utilizablevolume"); - return (Criteria) this; - } - - public Criteria andUtilizablevolumeLessThanOrEqualTo(Float value) { - addCriterion("UTILIZABLEVOLUME <=", value, "utilizablevolume"); - return (Criteria) this; - } - - public Criteria andUtilizablevolumeIn(List values) { - addCriterion("UTILIZABLEVOLUME in", values, "utilizablevolume"); - return (Criteria) this; - } - - public Criteria andUtilizablevolumeNotIn(List values) { - addCriterion("UTILIZABLEVOLUME not in", values, "utilizablevolume"); - return (Criteria) this; - } - - public Criteria andUtilizablevolumeBetween(Float value1, Float value2) { - addCriterion("UTILIZABLEVOLUME between", value1, value2, "utilizablevolume"); - return (Criteria) this; - } - - public Criteria andUtilizablevolumeNotBetween(Float value1, Float value2) { - addCriterion("UTILIZABLEVOLUME not between", value1, value2, "utilizablevolume"); - return (Criteria) this; - } - - public Criteria andNorrmallevelIsNull() { - addCriterion("NORRMALLEVEL is null"); - return (Criteria) this; - } - - public Criteria andNorrmallevelIsNotNull() { - addCriterion("NORRMALLEVEL is not null"); - return (Criteria) this; - } - - public Criteria andNorrmallevelEqualTo(Float value) { - addCriterion("NORRMALLEVEL =", value, "norrmallevel"); - return (Criteria) this; - } - - public Criteria andNorrmallevelNotEqualTo(Float value) { - addCriterion("NORRMALLEVEL <>", value, "norrmallevel"); - return (Criteria) this; - } - - public Criteria andNorrmallevelGreaterThan(Float value) { - addCriterion("NORRMALLEVEL >", value, "norrmallevel"); - return (Criteria) this; - } - - public Criteria andNorrmallevelGreaterThanOrEqualTo(Float value) { - addCriterion("NORRMALLEVEL >=", value, "norrmallevel"); - return (Criteria) this; - } - - public Criteria andNorrmallevelLessThan(Float value) { - addCriterion("NORRMALLEVEL <", value, "norrmallevel"); - return (Criteria) this; - } - - public Criteria andNorrmallevelLessThanOrEqualTo(Float value) { - addCriterion("NORRMALLEVEL <=", value, "norrmallevel"); - return (Criteria) this; - } - - public Criteria andNorrmallevelIn(List values) { - addCriterion("NORRMALLEVEL in", values, "norrmallevel"); - return (Criteria) this; - } - - public Criteria andNorrmallevelNotIn(List values) { - addCriterion("NORRMALLEVEL not in", values, "norrmallevel"); - return (Criteria) this; - } - - public Criteria andNorrmallevelBetween(Float value1, Float value2) { - addCriterion("NORRMALLEVEL between", value1, value2, "norrmallevel"); - return (Criteria) this; - } - - public Criteria andNorrmallevelNotBetween(Float value1, Float value2) { - addCriterion("NORRMALLEVEL not between", value1, value2, "norrmallevel"); - return (Criteria) this; - } - - public Criteria andFlooddetentionvolumeIsNull() { - addCriterion("FLOODDETENTIONVOLUME is null"); - return (Criteria) this; - } - - public Criteria andFlooddetentionvolumeIsNotNull() { - addCriterion("FLOODDETENTIONVOLUME is not null"); - return (Criteria) this; - } - - public Criteria andFlooddetentionvolumeEqualTo(Float value) { - addCriterion("FLOODDETENTIONVOLUME =", value, "flooddetentionvolume"); - return (Criteria) this; - } - - public Criteria andFlooddetentionvolumeNotEqualTo(Float value) { - addCriterion("FLOODDETENTIONVOLUME <>", value, "flooddetentionvolume"); - return (Criteria) this; - } - - public Criteria andFlooddetentionvolumeGreaterThan(Float value) { - addCriterion("FLOODDETENTIONVOLUME >", value, "flooddetentionvolume"); - return (Criteria) this; - } - - public Criteria andFlooddetentionvolumeGreaterThanOrEqualTo(Float value) { - addCriterion("FLOODDETENTIONVOLUME >=", value, "flooddetentionvolume"); - return (Criteria) this; - } - - public Criteria andFlooddetentionvolumeLessThan(Float value) { - addCriterion("FLOODDETENTIONVOLUME <", value, "flooddetentionvolume"); - return (Criteria) this; - } - - public Criteria andFlooddetentionvolumeLessThanOrEqualTo(Float value) { - addCriterion("FLOODDETENTIONVOLUME <=", value, "flooddetentionvolume"); - return (Criteria) this; - } - - public Criteria andFlooddetentionvolumeIn(List values) { - addCriterion("FLOODDETENTIONVOLUME in", values, "flooddetentionvolume"); - return (Criteria) this; - } - - public Criteria andFlooddetentionvolumeNotIn(List values) { - addCriterion("FLOODDETENTIONVOLUME not in", values, "flooddetentionvolume"); - return (Criteria) this; - } - - public Criteria andFlooddetentionvolumeBetween(Float value1, Float value2) { - addCriterion("FLOODDETENTIONVOLUME between", value1, value2, "flooddetentionvolume"); - return (Criteria) this; - } - - public Criteria andFlooddetentionvolumeNotBetween(Float value1, Float value2) { - addCriterion("FLOODDETENTIONVOLUME not between", value1, value2, "flooddetentionvolume"); - return (Criteria) this; - } - - public Criteria andDeadlevelIsNull() { - addCriterion("DEADLEVEL is null"); - return (Criteria) this; - } - - public Criteria andDeadlevelIsNotNull() { - addCriterion("DEADLEVEL is not null"); - return (Criteria) this; - } - - public Criteria andDeadlevelEqualTo(Float value) { - addCriterion("DEADLEVEL =", value, "deadlevel"); - return (Criteria) this; - } - - public Criteria andDeadlevelNotEqualTo(Float value) { - addCriterion("DEADLEVEL <>", value, "deadlevel"); - return (Criteria) this; - } - - public Criteria andDeadlevelGreaterThan(Float value) { - addCriterion("DEADLEVEL >", value, "deadlevel"); - return (Criteria) this; - } - - public Criteria andDeadlevelGreaterThanOrEqualTo(Float value) { - addCriterion("DEADLEVEL >=", value, "deadlevel"); - return (Criteria) this; - } - - public Criteria andDeadlevelLessThan(Float value) { - addCriterion("DEADLEVEL <", value, "deadlevel"); - return (Criteria) this; - } - - public Criteria andDeadlevelLessThanOrEqualTo(Float value) { - addCriterion("DEADLEVEL <=", value, "deadlevel"); - return (Criteria) this; - } - - public Criteria andDeadlevelIn(List values) { - addCriterion("DEADLEVEL in", values, "deadlevel"); - return (Criteria) this; - } - - public Criteria andDeadlevelNotIn(List values) { - addCriterion("DEADLEVEL not in", values, "deadlevel"); - return (Criteria) this; - } - - public Criteria andDeadlevelBetween(Float value1, Float value2) { - addCriterion("DEADLEVEL between", value1, value2, "deadlevel"); - return (Criteria) this; - } - - public Criteria andDeadlevelNotBetween(Float value1, Float value2) { - addCriterion("DEADLEVEL not between", value1, value2, "deadlevel"); - return (Criteria) this; - } - - public Criteria andAreaCodeIsNull() { - addCriterion("AREA_CODE is null"); - return (Criteria) this; - } - - public Criteria andAreaCodeIsNotNull() { - addCriterion("AREA_CODE is not null"); - return (Criteria) this; - } - - public Criteria andAreaCodeEqualTo(String value) { - addCriterion("AREA_CODE =", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeNotEqualTo(String value) { - addCriterion("AREA_CODE <>", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeGreaterThan(String value) { - addCriterion("AREA_CODE >", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeGreaterThanOrEqualTo(String value) { - addCriterion("AREA_CODE >=", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeLessThan(String value) { - addCriterion("AREA_CODE <", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeLessThanOrEqualTo(String value) { - addCriterion("AREA_CODE <=", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeLike(String value) { - addCriterion("AREA_CODE like", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeNotLike(String value) { - addCriterion("AREA_CODE not like", value, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeIn(List values) { - addCriterion("AREA_CODE in", values, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeNotIn(List values) { - addCriterion("AREA_CODE not in", values, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeBetween(String value1, String value2) { - addCriterion("AREA_CODE between", value1, value2, "areaCode"); - return (Criteria) this; - } - - public Criteria andAreaCodeNotBetween(String value1, String value2) { - addCriterion("AREA_CODE not between", value1, value2, "areaCode"); - return (Criteria) this; - } - - 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 values) { - addCriterion("LRCD in", values, "lrcd"); - return (Criteria) this; - } - - public Criteria andLrcdNotIn(List 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 andSzhldmIsNull() { - addCriterion("SZHLDM is null"); - return (Criteria) this; - } - - public Criteria andSzhldmIsNotNull() { - addCriterion("SZHLDM is not null"); - return (Criteria) this; - } - - public Criteria andSzhldmEqualTo(String value) { - addCriterion("SZHLDM =", value, "szhldm"); - return (Criteria) this; - } - - public Criteria andSzhldmNotEqualTo(String value) { - addCriterion("SZHLDM <>", value, "szhldm"); - return (Criteria) this; - } - - public Criteria andSzhldmGreaterThan(String value) { - addCriterion("SZHLDM >", value, "szhldm"); - return (Criteria) this; - } - - public Criteria andSzhldmGreaterThanOrEqualTo(String value) { - addCriterion("SZHLDM >=", value, "szhldm"); - return (Criteria) this; - } - - public Criteria andSzhldmLessThan(String value) { - addCriterion("SZHLDM <", value, "szhldm"); - return (Criteria) this; - } - - public Criteria andSzhldmLessThanOrEqualTo(String value) { - addCriterion("SZHLDM <=", value, "szhldm"); - return (Criteria) this; - } - - public Criteria andSzhldmLike(String value) { - addCriterion("SZHLDM like", value, "szhldm"); - return (Criteria) this; - } - - public Criteria andSzhldmNotLike(String value) { - addCriterion("SZHLDM not like", value, "szhldm"); - return (Criteria) this; - } - - public Criteria andSzhldmIn(List values) { - addCriterion("SZHLDM in", values, "szhldm"); - return (Criteria) this; - } - - public Criteria andSzhldmNotIn(List values) { - addCriterion("SZHLDM not in", values, "szhldm"); - return (Criteria) this; - } - - public Criteria andSzhldmBetween(String value1, String value2) { - addCriterion("SZHLDM between", value1, value2, "szhldm"); - return (Criteria) this; - } - - public Criteria andSzhldmNotBetween(String value1, String value2) { - addCriterion("SZHLDM not between", value1, value2, "szhldm"); - return (Criteria) this; - } - - public Criteria andDongjIsNull() { - addCriterion("DONGJ is null"); - return (Criteria) this; - } - - public Criteria andDongjIsNotNull() { - addCriterion("DONGJ is not null"); - return (Criteria) this; - } - - public Criteria andDongjEqualTo(Float value) { - addCriterion("DONGJ =", value, "dongj"); - return (Criteria) this; - } - - public Criteria andDongjNotEqualTo(Float value) { - addCriterion("DONGJ <>", value, "dongj"); - return (Criteria) this; - } - - public Criteria andDongjGreaterThan(Float value) { - addCriterion("DONGJ >", value, "dongj"); - return (Criteria) this; - } - - public Criteria andDongjGreaterThanOrEqualTo(Float value) { - addCriterion("DONGJ >=", value, "dongj"); - return (Criteria) this; - } - - public Criteria andDongjLessThan(Float value) { - addCriterion("DONGJ <", value, "dongj"); - return (Criteria) this; - } - - public Criteria andDongjLessThanOrEqualTo(Float value) { - addCriterion("DONGJ <=", value, "dongj"); - return (Criteria) this; - } - - public Criteria andDongjIn(List values) { - addCriterion("DONGJ in", values, "dongj"); - return (Criteria) this; - } - - public Criteria andDongjNotIn(List values) { - addCriterion("DONGJ not in", values, "dongj"); - return (Criteria) this; - } - - public Criteria andDongjBetween(Float value1, Float value2) { - addCriterion("DONGJ between", value1, value2, "dongj"); - return (Criteria) this; - } - - public Criteria andDongjNotBetween(Float value1, Float value2) { - addCriterion("DONGJ not between", value1, value2, "dongj"); - return (Criteria) this; - } - - public Criteria andBeiwIsNull() { - addCriterion("BEIW is null"); - return (Criteria) this; - } - - public Criteria andBeiwIsNotNull() { - addCriterion("BEIW is not null"); - return (Criteria) this; - } - - public Criteria andBeiwEqualTo(Float value) { - addCriterion("BEIW =", value, "beiw"); - return (Criteria) this; - } - - public Criteria andBeiwNotEqualTo(Float value) { - addCriterion("BEIW <>", value, "beiw"); - return (Criteria) this; - } - - public Criteria andBeiwGreaterThan(Float value) { - addCriterion("BEIW >", value, "beiw"); - return (Criteria) this; - } - - public Criteria andBeiwGreaterThanOrEqualTo(Float value) { - addCriterion("BEIW >=", value, "beiw"); - return (Criteria) this; - } - - public Criteria andBeiwLessThan(Float value) { - addCriterion("BEIW <", value, "beiw"); - return (Criteria) this; - } - - public Criteria andBeiwLessThanOrEqualTo(Float value) { - addCriterion("BEIW <=", value, "beiw"); - return (Criteria) this; - } - - public Criteria andBeiwIn(List values) { - addCriterion("BEIW in", values, "beiw"); - return (Criteria) this; - } - - public Criteria andBeiwNotIn(List values) { - addCriterion("BEIW not in", values, "beiw"); - return (Criteria) this; - } - - public Criteria andBeiwBetween(Float value1, Float value2) { - addCriterion("BEIW between", value1, value2, "beiw"); - return (Criteria) this; - } - - public Criteria andBeiwNotBetween(Float value1, Float value2) { - addCriterion("BEIW not between", value1, value2, "beiw"); - 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); - } - } -} \ No newline at end of file diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirRefdata.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirRefdata.java deleted file mode 100644 index d389af5..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirRefdata.java +++ /dev/null @@ -1,50 +0,0 @@ -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; - } - -} \ No newline at end of file diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirRefdataExample.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirRefdataExample.java deleted file mode 100644 index c59eabc..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirRefdataExample.java +++ /dev/null @@ -1,480 +0,0 @@ -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 oredCriteria; - - public ReservoirRefdataExample() { - oredCriteria = new ArrayList(); - } - - 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 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 criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List 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 values) { - addCriterion("STCD in", values, "stcd"); - return (Criteria) this; - } - - public Criteria andStcdNotIn(List 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 values) { - addCriterion("REFSTCD in", values, "refstcd"); - return (Criteria) this; - } - - public Criteria andRefstcdNotIn(List 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 values) { - addCriterion("REFQPOINT in", values, "refqpoint"); - return (Criteria) this; - } - - public Criteria andRefqpointNotIn(List 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 values) { - addCriterion("REFZPOINT in", values, "refzpoint"); - return (Criteria) this; - } - - public Criteria andRefzpointNotIn(List 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); - } - } -} \ No newline at end of file diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirWaterManage.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirWaterManage.java deleted file mode 100644 index fdb15f0..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirWaterManage.java +++ /dev/null @@ -1,95 +0,0 @@ -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; - } -} \ No newline at end of file diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirWaterManageExample.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirWaterManageExample.java deleted file mode 100644 index 64bf2f4..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/ReservoirWaterManageExample.java +++ /dev/null @@ -1,751 +0,0 @@ -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 oredCriteria; - - public ReservoirWaterManageExample() { - oredCriteria = new ArrayList(); - } - - 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 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 criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List 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 values) { - addCriterion("ID in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List 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 values) { - addCriterion("MONTH in", values, "month"); - return (Criteria) this; - } - - public Criteria andMonthNotIn(List 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 values) { - addCriterion("FIRST_AREA in", values, "firstArea"); - return (Criteria) this; - } - - public Criteria andFirstAreaNotIn(List 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 values) { - addCriterion("SECOND_AREA in", values, "secondArea"); - return (Criteria) this; - } - - public Criteria andSecondAreaNotIn(List 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 values) { - addCriterion("THIRD_AREA in", values, "thirdArea"); - return (Criteria) this; - } - - public Criteria andThirdAreaNotIn(List 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 values) { - addCriterion("FOURTH_AREA in", values, "fourthArea"); - return (Criteria) this; - } - - public Criteria andFourthAreaNotIn(List 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 values) { - addCriterion("FIVTH_AREA in", values, "fivthArea"); - return (Criteria) this; - } - - public Criteria andFivthAreaNotIn(List 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 values) { - addCriterion("SIXTH_AREA in", values, "sixthArea"); - return (Criteria) this; - } - - public Criteria andSixthAreaNotIn(List 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 values) { - addCriterion("STCD in", values, "stcd"); - return (Criteria) this; - } - - public Criteria andStcdNotIn(List 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); - } - } -} \ No newline at end of file diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/StZvarlB.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/StZvarlB.java deleted file mode 100644 index 3bc009f..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/StZvarlB.java +++ /dev/null @@ -1,92 +0,0 @@ -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; - } -} \ No newline at end of file diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/StZvarlBExample.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/StZvarlBExample.java deleted file mode 100644 index d510e14..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/StZvarlBExample.java +++ /dev/null @@ -1,692 +0,0 @@ -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 oredCriteria; - - public StZvarlBExample() { - oredCriteria = new ArrayList(); - } - - 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 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 criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List 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 values) { - addCriterion("ID in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List 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 values) { - addCriterion("STCD in", values, "stcd"); - return (Criteria) this; - } - - public Criteria andStcdNotIn(List 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 values) { - addCriterion("MSTM in", values, "mstm"); - return (Criteria) this; - } - - public Criteria andMstmNotIn(List 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 values) { - addCriterion("PTNO in", values, "ptno"); - return (Criteria) this; - } - - public Criteria andPtnoNotIn(List 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 values) { - addCriterion("RZ in", values, "rz"); - return (Criteria) this; - } - - public Criteria andRzNotIn(List 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 values) { - addCriterion("W in", values, "w"); - return (Criteria) this; - } - - public Criteria andWNotIn(List 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 values) { - addCriterion("WSFA in", values, "wsfa"); - return (Criteria) this; - } - - public Criteria andWsfaNotIn(List 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 values) { - addCriterion("MODITIME in", values, "moditime"); - return (Criteria) this; - } - - public Criteria andModitimeNotIn(List 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); - } - } -} \ No newline at end of file diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/WqLrinfB.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/WqLrinfB.java deleted file mode 100644 index 3c71b9b..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/WqLrinfB.java +++ /dev/null @@ -1,72 +0,0 @@ -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; - } - -} \ No newline at end of file diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/WqLrinfBExample.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/WqLrinfBExample.java deleted file mode 100644 index e8ef6c8..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/entity/WqLrinfBExample.java +++ /dev/null @@ -1,601 +0,0 @@ -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 oredCriteria; - - public WqLrinfBExample() { - oredCriteria = new ArrayList(); - } - - 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 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 criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List 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 values) { - addCriterion("LRCD in", values, "lrcd"); - return (Criteria) this; - } - - public Criteria andLrcdNotIn(List 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 values) { - addCriterion("WATP in", values, "watp"); - return (Criteria) this; - } - - public Criteria andWatpNotIn(List 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 values) { - addCriterion("LRNM in", values, "lrnm"); - return (Criteria) this; - } - - public Criteria andLrnmNotIn(List 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 values) { - addCriterion("LRAR in", values, "lrar"); - return (Criteria) this; - } - - public Criteria andLrarNotIn(List 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 values) { - addCriterion("RSCP in", values, "rscp"); - return (Criteria) this; - } - - public Criteria andRscpNotIn(List 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 values) { - addCriterion("COORDINATESET in", values, "coordinateset"); - return (Criteria) this; - } - - public Criteria andCoordinatesetNotIn(List 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); - } - } -} \ No newline at end of file diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/vo/ReservoirInfoVo.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/vo/ReservoirInfoVo.java deleted file mode 100644 index 16797da..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/vo/ReservoirInfoVo.java +++ /dev/null @@ -1,64 +0,0 @@ -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 imageReservoirInfoList; - - private List 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()); - - } - -} diff --git a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/vo/ReservoirRefdataVo.java b/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/vo/ReservoirRefdataVo.java deleted file mode 100644 index 046ab2f..0000000 --- a/hzims-service-api/base-info-api/src/main/java/com/hnac/hzims/baseinfo/vo/ReservoirRefdataVo.java +++ /dev/null @@ -1,57 +0,0 @@ -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; - } - - - -} diff --git a/hzims-service-api/dam-safety-api/pom.xml b/hzims-service-api/dam-safety-api/pom.xml deleted file mode 100644 index 6d4ee93..0000000 --- a/hzims-service-api/dam-safety-api/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - - com.hnac.hzinfo.data - hzinfo-data-sdk - - - - com.hnac.hzims - hzims-service-api - 4.0.0-SNAPSHOT - - - dam-safety-api - - - 8 - 8 - UTF-8 - - - \ No newline at end of file diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/TBuilding.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/TBuilding.java deleted file mode 100644 index 21fe57a..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/TBuilding.java +++ /dev/null @@ -1,37 +0,0 @@ -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;//坝高 - -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/TProjInfo.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/TProjInfo.java deleted file mode 100644 index 0670671..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/TProjInfo.java +++ /dev/null @@ -1,38 +0,0 @@ -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; -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/TSectionConfig.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/TSectionConfig.java deleted file mode 100644 index 5eaf6a8..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/TSectionConfig.java +++ /dev/null @@ -1,34 +0,0 @@ -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; - -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDamsB.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDamsB.java deleted file mode 100644 index a6160f2..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDamsB.java +++ /dev/null @@ -1,31 +0,0 @@ -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; -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDfrSrhrdsmp.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDfrSrhrdsmp.java deleted file mode 100644 index 0b165bf..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDfrSrhrdsmp.java +++ /dev/null @@ -1,56 +0,0 @@ -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; -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDfrSrvrdsbp.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDfrSrvrdsbp.java deleted file mode 100644 index 60ee6aa..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDfrSrvrdsbp.java +++ /dev/null @@ -1,55 +0,0 @@ -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; -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDfrSrvrdsmp.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDfrSrvrdsmp.java deleted file mode 100644 index 54af217..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpDfrSrvrdsmp.java +++ /dev/null @@ -1,53 +0,0 @@ -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; - -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSectionB.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSectionB.java deleted file mode 100644 index 26b408b..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSectionB.java +++ /dev/null @@ -1,38 +0,0 @@ -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; -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSpgPztb.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSpgPztb.java deleted file mode 100644 index 4ed8686..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSpgPztb.java +++ /dev/null @@ -1,57 +0,0 @@ -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; - - - -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSpgSpprmp.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSpgSpprmp.java deleted file mode 100644 index b9ed7aa..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSpgSpprmp.java +++ /dev/null @@ -1,52 +0,0 @@ -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; - - -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSpgSpqnmp.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSpgSpqnmp.java deleted file mode 100644 index d6a47ae..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/entity/WrpSpgSpqnmp.java +++ /dev/null @@ -1,45 +0,0 @@ -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; -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/feign/IWrpSectionBClient.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/feign/IWrpSectionBClient.java deleted file mode 100644 index 874e072..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/feign/IWrpSectionBClient.java +++ /dev/null @@ -1,31 +0,0 @@ -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(Map param); - - @GetMapping(GET_REAL_DATA) - R> getRealData(String deviceCode); -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/TBuildingVo.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/TBuildingVo.java deleted file mode 100644 index c61c0e5..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/TBuildingVo.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.hnac.hzims.damsafety.vo; - - -import com.hnac.hzims.damsafety.entity.TBuilding; - -public class TBuildingVo extends TBuilding { - -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/TProjInfoVo.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/TProjInfoVo.java deleted file mode 100644 index 96ccab5..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/TProjInfoVo.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.hnac.hzims.damsafety.vo; - - -import com.hnac.hzims.damsafety.entity.TProjInfo; - -public class TProjInfoVo extends TProjInfo { - -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpDfrSrhrdsmpVo.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpDfrSrhrdsmpVo.java deleted file mode 100644 index 23143d7..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpDfrSrhrdsmpVo.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hnac.hzims.damsafety.vo; - -import com.hnac.hzims.damsafety.entity.WrpDfrSrhrdsmp; - -public class WrpDfrSrhrdsmpVo extends WrpDfrSrhrdsmp { - -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpDfrSrvrdsbpVo.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpDfrSrvrdsbpVo.java deleted file mode 100644 index 755bb19..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpDfrSrvrdsbpVo.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hnac.hzims.damsafety.vo; - - -import com.hnac.hzims.damsafety.entity.WrpDfrSrvrdsbp; - -public class WrpDfrSrvrdsbpVo extends WrpDfrSrvrdsbp { -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpDfrSrvrdsmpVo.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpDfrSrvrdsmpVo.java deleted file mode 100644 index 8511d94..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpDfrSrvrdsmpVo.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hnac.hzims.damsafety.vo; - - -import com.hnac.hzims.damsafety.entity.WrpDfrSrvrdsmp; - -public class WrpDfrSrvrdsmpVo extends WrpDfrSrvrdsmp { -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSectionBVO.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSectionBVO.java deleted file mode 100644 index 04ab4ad..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSectionBVO.java +++ /dev/null @@ -1,16 +0,0 @@ -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 points; -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSpgPztbVo.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSpgPztbVo.java deleted file mode 100644 index b6bfa5e..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSpgPztbVo.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hnac.hzims.damsafety.vo; - - -import com.hnac.hzims.damsafety.entity.WrpSpgPztb; - -public class WrpSpgPztbVo extends WrpSpgPztb { -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSpgSpprmpVo.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSpgSpprmpVo.java deleted file mode 100644 index 902d0e8..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSpgSpprmpVo.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hnac.hzims.damsafety.vo; - - -import com.hnac.hzims.damsafety.entity.WrpSpgSpprmp; - -public class WrpSpgSpprmpVo extends WrpSpgSpprmp { -} diff --git a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSpgSpqnmpVo.java b/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSpgSpqnmpVo.java deleted file mode 100644 index 269abd7..0000000 --- a/hzims-service-api/dam-safety-api/src/main/java/com/hnac/hzims/damsafety/vo/WrpSpgSpqnmpVo.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hnac.hzims.damsafety.vo; - - -import com.hnac.hzims.damsafety.entity.WrpSpgSpqnmp; - -public class WrpSpgSpqnmpVo extends WrpSpgSpqnmp { -} diff --git a/hzims-service-api/digital-twin-display-api/pom.xml b/hzims-service-api/digital-twin-display-api/pom.xml deleted file mode 100644 index 0ca55dc..0000000 --- a/hzims-service-api/digital-twin-display-api/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - - com.hnac.hzims - hzims-service-api - 4.0.0-SNAPSHOT - - - - digital-twin-display-api - jar - ${hzims.project.version} - - - 8 - 8 - UTF-8 - - - \ No newline at end of file diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/constants/AbnormalAlarmConstant.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/constants/AbnormalAlarmConstant.java index 9ece78b..72f7643 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/constants/AbnormalAlarmConstant.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/constants/AbnormalAlarmConstant.java @@ -23,7 +23,7 @@ public interface AbnormalAlarmConstant { /**故障**/ String FAULT = "3"; - + /**预警**/ Long EARLY_WARNING = 20L; diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java index 30bd222..4267005 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java @@ -21,7 +21,6 @@ import javax.validation.constraints.NotNull; import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.List; @EqualsAndHashCode(callSuper = true) @Data @@ -163,6 +162,7 @@ public class StationEntity extends TenantEntity implements Serializable { private Integer sort; @ApiModelProperty("实时画面绑定账号秘钥") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String secretKey; @@ -175,48 +175,8 @@ public class StationEntity extends TenantEntity implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) private Boolean isAbroad; - - - /** - * 生态流量泄放设施 - */ - private String dischargeFacilities; - - /** - * 监测方式 - */ - private String monitoringMode; - - - /** - * 是否绿色小水电示范电站 0 否 1 是 - */ - private Boolean isPowerStation; - - - /** - * 核定值 - */ - private Float discharge; - - - /** - * 图片 list - */ - @TableField(exist = false) - private List imageStationList; - - - /** - * 视频 list - */ - @TableField(exist = false) - private List videoStationList; - - - /** - * 文件 list - */ - @TableField(exist = false) - private List fileStationList; + @ApiModelProperty("所属国家") + @QueryField(condition = SqlCondition.EQUAL) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String refCountry; } diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentDefinitionEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentDefinitionEntity.java index 7dbba17..e5b8a4e 100644 --- a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentDefinitionEntity.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentDefinitionEntity.java @@ -39,9 +39,11 @@ public class ContentDefinitionEntity extends TenantEntity implements Serializabl private String description; @ApiModelProperty(value = "记录类型 0不记录 1仅选择 2仅记值 3选择并记值") + @QueryField(condition = SqlCondition.EQUAL) private String recordType; @ApiModelProperty(value = "检测类型") + @QueryField(condition = SqlCondition.EQUAL) private String checkType; @ApiModelProperty(value = "检测类型子类") diff --git a/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/dto/WxMessageDTO.java b/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/dto/WxMessageDTO.java index 0c40b50..6846b6d 100644 --- a/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/dto/WxMessageDTO.java +++ b/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/dto/WxMessageDTO.java @@ -45,7 +45,7 @@ public class WxMessageDTO implements Serializable { @NotNull @ApiModelProperty(value = "推送消息键值对") - private Map map; + private Map map; @NotNull @ApiModelProperty(value = "内容") diff --git a/hzims-service-api/pom.xml b/hzims-service-api/pom.xml index 6fc1e55..397a172 100644 --- a/hzims-service-api/pom.xml +++ b/hzims-service-api/pom.xml @@ -27,12 +27,6 @@ weather-api common-api middle-api - base-info-api - digital-twin-display-api - dam-safety-api - video-image-api - water-quality-api - water-rain-api diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/workarea/entity/WorkArea.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/workarea/entity/WorkArea.java new file mode 100644 index 0000000..0f1ae1a --- /dev/null +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/workarea/entity/WorkArea.java @@ -0,0 +1,54 @@ +package com.hnac.hzims.safeproduct.workarea.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("work_area") +public class WorkArea { + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 区域名称 + */ + @TableField("area_name") + private String areaName; + + /** + * 安全责任人 + */ + @TableField("direct_op_id") + private Long directOpId; + + /** + * 监管部门 + */ + @TableField("depart_id") + private Long departId; + + /** + * 分管领导 + */ + @TableField("lead_op_id") + private Long leadOpId; + + /** + * 区域范围 + */ + @TableField("area_range") + private String areaRange; + + private String directOpName; + + private String departName; + + private String leadOpName; +} diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/workarea/vo/WorkAreaQueryVo.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/workarea/vo/WorkAreaQueryVo.java new file mode 100644 index 0000000..61c2160 --- /dev/null +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/workarea/vo/WorkAreaQueryVo.java @@ -0,0 +1,32 @@ +package com.hnac.hzims.safeproduct.workarea.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +@Data +public class WorkAreaQueryVo { + + /** + * 区域名称 + */ + @TableField("area_name") + private String areaName; + + /** + * 安全责任人 + */ + @TableField("direct_op_id") + private Long directOpId; + + /** + * 监管部门 + */ + @TableField("depart_id") + private Long departId; + + /** + * 分管领导 + */ + @TableField("lead_op_id") + private Long leadOpId; +} diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/dto/TicketStatisticDTO.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/dto/TicketStatisticDTO.java new file mode 100644 index 0000000..4378262 --- /dev/null +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/dto/TicketStatisticDTO.java @@ -0,0 +1,35 @@ +package com.hnac.hzims.ticket.allTicket.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * @ClassName TicketStatisticDTO + * @description: 两票统计请求 + * @author: hx + * @create: 2023-08-17 11:26 + * @Version 4.0 + **/ +@Data +@Builder +@EqualsAndHashCode +public class TicketStatisticDTO implements Serializable { + + private String deptIds; + + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + private LocalDateTime startTime; + + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + private LocalDateTime endTime; + +} diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/entity/TicketInfoEntity.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/entity/TicketInfoEntity.java new file mode 100644 index 0000000..ad63e24 --- /dev/null +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/entity/TicketInfoEntity.java @@ -0,0 +1,71 @@ +package com.hnac.hzims.ticket.allTicket.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springblade.core.mp.support.QueryField; +import org.springblade.core.mp.support.SqlCondition; +import org.springblade.core.tenant.mp.TenantEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * @ClassName TicketInfoEntity + * @description: + * @author: hx + * @create: 2023-08-30 08:30 + * @Version 4.0 + **/ +@TableName("v_hzims_ticket_info") +@ApiModel("两票合计对象") +@Data +public class TicketInfoEntity extends TenantEntity { + @ApiModelProperty("审批流程ID") + @QueryField(condition = SqlCondition.EQUAL) + private String processInstanceId; + + @ApiModelProperty(value = "关联业务类型") + @QueryField(condition = SqlCondition.EQUAL) + private String type; + + @ApiModelProperty(value = "单位") + @QueryField(condition = SqlCondition.LIKE) + private String company; + + @ApiModelProperty(value = "编号") + @QueryField(condition = SqlCondition.LIKE) + private String code; + + @ApiModelProperty(value = "关联业务类型") + @QueryField(condition = SqlCondition.EQUAL) + private String taskType; + + @ApiModelProperty(value = "关联业务ID") + @QueryField(condition = SqlCondition.EQUAL) + @JsonSerialize(nullsUsing = NullSerializer.class) + private Long taskId; + + @ApiModelProperty("关联业务名称") + @QueryField(condition = SqlCondition.LIKE) + private String taskName; + + @ApiModelProperty(value = "计划开始时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime planStartTime; + + @ApiModelProperty(value = "计划结束时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime planEndTime; + + @ApiModelProperty("流程描述") + private String flowDescription; + +} diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/ITicketInfoAllClient.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/ITicketInfoAllClient.java index a2a4335..bb2971c 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/ITicketInfoAllClient.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/ITicketInfoAllClient.java @@ -1,11 +1,14 @@ package com.hnac.hzims.ticket.allTicket.fegin; +import com.hnac.hzims.ticket.allTicket.dto.TicketStatisticDTO; import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; import com.hnac.hzims.ticket.allTicket.vo.DoublePassVO; import com.hnac.hzims.ticket.allTicket.vo.TicketInfoStatisticVO; import com.hnac.hzims.ticket.constants.TicketConstants; +import org.springblade.core.tool.api.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.time.LocalDateTime; @@ -25,6 +28,7 @@ public interface ITicketInfoAllClient { String DOUBLE_PASS_RATE = "/getDoublePassRate"; String DOUBLE_PASS_QUANTITY = "/getDoublePassQuantity"; String GET_TICKET_REPORT_STATISTIC = API_PREFIX+"/getTicketReportStatistic"; + String GET_TICKET_PASS_RATE = API_PREFIX + "/getTicketPassRate"; /** * 统计站点统计月报-两票 @@ -61,4 +65,7 @@ public interface ITicketInfoAllClient { List getDoublePassQuantity(@RequestParam(value = "stationMap") Map stationMap, @RequestParam(value = "firstDateTime") LocalDateTime firstDateTime, @RequestParam(value = "now") LocalDateTime now); + + @GetMapping(GET_TICKET_PASS_RATE) + R getTicketPassRate(TicketStatisticDTO ticketStatisticDTO); } diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClientFallback.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClientFallback.java index b14d13b..76506d0 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClientFallback.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClientFallback.java @@ -1,8 +1,10 @@ package com.hnac.hzims.ticket.allTicket.fegin; +import com.hnac.hzims.ticket.allTicket.dto.TicketStatisticDTO; import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; import com.hnac.hzims.ticket.allTicket.vo.DoublePassVO; import com.hnac.hzims.ticket.allTicket.vo.TicketInfoStatisticVO; +import org.springblade.core.tool.api.R; import org.springframework.stereotype.Component; import java.time.LocalDateTime; @@ -34,4 +36,9 @@ public class TicketInfoAllClientFallback implements ITicketInfoAllClient { public List getDoublePassQuantity(Map stationMap, LocalDateTime firstDateTime, LocalDateTime now) { return null; } + + @Override + public R getTicketPassRate(TicketStatisticDTO ticketStatisticDTO) { + return null; + } } diff --git a/hzims-service-api/video-image-api/pom.xml b/hzims-service-api/video-image-api/pom.xml deleted file mode 100644 index b05af54..0000000 --- a/hzims-service-api/video-image-api/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 4.0.0 - - com.hnac.hzims - hzims-service-api - 4.0.0-SNAPSHOT - - - video-image-api - - - 8 - 8 - UTF-8 - - - \ No newline at end of file diff --git a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImageConfig.java b/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImageConfig.java deleted file mode 100644 index 966b016..0000000 --- a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImageConfig.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hnac.hzims.videoimage.entity; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -@Data -public class ImageConfig { - private Long id; - - private String stcd; - - private String name; - - @ApiParam(value="配置参数中的type有两种：0 代表常量数据， 1代表热点数据") - private String type; - - private String realid;//旧版本的实时数据id - - private String deviceCode;//分析模型code 获取实时数据 - - private Integer dataSource; - - private String code;//属性编码 - - private String value; - - private String unit; - -} \ No newline at end of file diff --git a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImageConfigExample.java b/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImageConfigExample.java deleted file mode 100644 index 2e1905e..0000000 --- a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImageConfigExample.java +++ /dev/null @@ -1,680 +0,0 @@ -package com.hnac.hzims.videoimage.entity; - -import java.util.ArrayList; -import java.util.List; - -public class ImageConfigExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public ImageConfigExample() { - oredCriteria = new ArrayList(); - } - - 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 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 criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List 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(Long value) { - addCriterion("ID =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("ID <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("ID >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("ID >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("ID <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("ID <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("ID in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("ID not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("ID between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long 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 values) { - addCriterion("STCD in", values, "stcd"); - return (Criteria) this; - } - - public Criteria andStcdNotIn(List 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 andNameIsNull() { - addCriterion("NAME is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("NAME is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("NAME =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("NAME <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("NAME >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("NAME >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("NAME <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("NAME <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("NAME like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("NAME not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("NAME in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("NAME not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("NAME between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("NAME not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andTypeIsNull() { - addCriterion("TYPE is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("TYPE is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(String value) { - addCriterion("TYPE =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(String value) { - addCriterion("TYPE <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(String value) { - addCriterion("TYPE >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(String value) { - addCriterion("TYPE >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(String value) { - addCriterion("TYPE <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(String value) { - addCriterion("TYPE <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLike(String value) { - addCriterion("TYPE like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotLike(String value) { - addCriterion("TYPE not like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("TYPE in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("TYPE not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(String value1, String value2) { - addCriterion("TYPE between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(String value1, String value2) { - addCriterion("TYPE not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andRealidIsNull() { - addCriterion("REALID is null"); - return (Criteria) this; - } - - public Criteria andRealidIsNotNull() { - addCriterion("REALID is not null"); - return (Criteria) this; - } - - public Criteria andRealidEqualTo(String value) { - addCriterion("REALID =", value, "realid"); - return (Criteria) this; - } - - public Criteria andRealidNotEqualTo(String value) { - addCriterion("REALID <>", value, "realid"); - return (Criteria) this; - } - - public Criteria andRealidGreaterThan(String value) { - addCriterion("REALID >", value, "realid"); - return (Criteria) this; - } - - public Criteria andRealidGreaterThanOrEqualTo(String value) { - addCriterion("REALID >=", value, "realid"); - return (Criteria) this; - } - - public Criteria andRealidLessThan(String value) { - addCriterion("REALID <", value, "realid"); - return (Criteria) this; - } - - public Criteria andRealidLessThanOrEqualTo(String value) { - addCriterion("REALID <=", value, "realid"); - return (Criteria) this; - } - - public Criteria andRealidLike(String value) { - addCriterion("REALID like", value, "realid"); - return (Criteria) this; - } - - public Criteria andRealidNotLike(String value) { - addCriterion("REALID not like", value, "realid"); - return (Criteria) this; - } - - public Criteria andRealidIn(List values) { - addCriterion("REALID in", values, "realid"); - return (Criteria) this; - } - - public Criteria andRealidNotIn(List values) { - addCriterion("REALID not in", values, "realid"); - return (Criteria) this; - } - - public Criteria andRealidBetween(String value1, String value2) { - addCriterion("REALID between", value1, value2, "realid"); - return (Criteria) this; - } - - public Criteria andRealidNotBetween(String value1, String value2) { - addCriterion("REALID not between", value1, value2, "realid"); - return (Criteria) this; - } - - public Criteria andValueIsNull() { - addCriterion("VALUE is null"); - return (Criteria) this; - } - - public Criteria andValueIsNotNull() { - addCriterion("VALUE is not null"); - return (Criteria) this; - } - - public Criteria andValueEqualTo(String value) { - addCriterion("VALUE =", value, "value"); - return (Criteria) this; - } - - public Criteria andValueNotEqualTo(String value) { - addCriterion("VALUE <>", value, "value"); - return (Criteria) this; - } - - public Criteria andValueGreaterThan(String value) { - addCriterion("VALUE >", value, "value"); - return (Criteria) this; - } - - public Criteria andValueGreaterThanOrEqualTo(String value) { - addCriterion("VALUE >=", value, "value"); - return (Criteria) this; - } - - public Criteria andValueLessThan(String value) { - addCriterion("VALUE <", value, "value"); - return (Criteria) this; - } - - public Criteria andValueLessThanOrEqualTo(String value) { - addCriterion("VALUE <=", value, "value"); - return (Criteria) this; - } - - public Criteria andValueLike(String value) { - addCriterion("VALUE like", value, "value"); - return (Criteria) this; - } - - public Criteria andValueNotLike(String value) { - addCriterion("VALUE not like", value, "value"); - return (Criteria) this; - } - - public Criteria andValueIn(List values) { - addCriterion("VALUE in", values, "value"); - return (Criteria) this; - } - - public Criteria andValueNotIn(List values) { - addCriterion("VALUE not in", values, "value"); - return (Criteria) this; - } - - public Criteria andValueBetween(String value1, String value2) { - addCriterion("VALUE between", value1, value2, "value"); - return (Criteria) this; - } - - public Criteria andValueNotBetween(String value1, String value2) { - addCriterion("VALUE not between", value1, value2, "value"); - return (Criteria) this; - } - - public Criteria andUnitIsNull() { - addCriterion("UNIT is null"); - return (Criteria) this; - } - - public Criteria andUnitIsNotNull() { - addCriterion("UNIT is not null"); - return (Criteria) this; - } - - public Criteria andUnitEqualTo(String value) { - addCriterion("UNIT =", value, "unit"); - return (Criteria) this; - } - - public Criteria andUnitNotEqualTo(String value) { - addCriterion("UNIT <>", value, "unit"); - return (Criteria) this; - } - - public Criteria andUnitGreaterThan(String value) { - addCriterion("UNIT >", value, "unit"); - return (Criteria) this; - } - - public Criteria andUnitGreaterThanOrEqualTo(String value) { - addCriterion("UNIT >=", value, "unit"); - return (Criteria) this; - } - - public Criteria andUnitLessThan(String value) { - addCriterion("UNIT <", value, "unit"); - return (Criteria) this; - } - - public Criteria andUnitLessThanOrEqualTo(String value) { - addCriterion("UNIT <=", value, "unit"); - return (Criteria) this; - } - - public Criteria andUnitLike(String value) { - addCriterion("UNIT like", value, "unit"); - return (Criteria) this; - } - - public Criteria andUnitNotLike(String value) { - addCriterion("UNIT not like", value, "unit"); - return (Criteria) this; - } - - public Criteria andUnitIn(List values) { - addCriterion("UNIT in", values, "unit"); - return (Criteria) this; - } - - public Criteria andUnitNotIn(List values) { - addCriterion("UNIT not in", values, "unit"); - return (Criteria) this; - } - - public Criteria andUnitBetween(String value1, String value2) { - addCriterion("UNIT between", value1, value2, "unit"); - return (Criteria) this; - } - - public Criteria andUnitNotBetween(String value1, String value2) { - addCriterion("UNIT not between", value1, value2, "unit"); - 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); - } - } -} \ No newline at end of file diff --git a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImageInfo.java b/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImageInfo.java deleted file mode 100644 index 5ddd835..0000000 --- a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImageInfo.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.hnac.hzims.videoimage.entity; - -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -public class ImageInfo { - private Long id; - - private String stcd; - - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date time; - - private String data; - - private String manualpath; - - public String getManualpath() { - return manualpath; - } - - public void setManualpath(String manualpath) { - this.manualpath = manualpath; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getStcd() { - return stcd; - } - - public void setStcd(String stcd) { - this.stcd = stcd == null ? null : stcd.trim(); - } - - public Date getTime() { - return time; - } - - public void setTime(Date time) { - this.time = time; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } -} \ No newline at end of file diff --git a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImageInfoExample.java b/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImageInfoExample.java deleted file mode 100644 index 0ad64f0..0000000 --- a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImageInfoExample.java +++ /dev/null @@ -1,391 +0,0 @@ -package com.hnac.hzims.videoimage.entity; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class ImageInfoExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public ImageInfoExample() { - oredCriteria = new ArrayList(); - } - - 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 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 criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List 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(Long value) { - addCriterion("ID =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("ID <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("ID >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("ID >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("ID <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("ID <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("ID in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("ID not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("ID between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long 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 values) { - addCriterion("STCD in", values, "stcd"); - return (Criteria) this; - } - - public Criteria andStcdNotIn(List 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 andTimeIsNull() { - addCriterion("TIME is null"); - return (Criteria) this; - } - - public Criteria andTimeIsNotNull() { - addCriterion("TIME is not null"); - return (Criteria) this; - } - - public Criteria andTimeEqualTo(Date value) { - addCriterion("TIME =", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeNotEqualTo(Date value) { - addCriterion("TIME <>", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeGreaterThan(Date value) { - addCriterion("TIME >", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeGreaterThanOrEqualTo(Date value) { - addCriterion("TIME >=", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeLessThan(Date value) { - addCriterion("TIME <", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeLessThanOrEqualTo(Date value) { - addCriterion("TIME <=", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeIn(List values) { - addCriterion("TIME in", values, "time"); - return (Criteria) this; - } - - public Criteria andTimeNotIn(List values) { - addCriterion("TIME not in", values, "time"); - return (Criteria) this; - } - - public Criteria andTimeBetween(Date value1, Date value2) { - addCriterion("TIME between", value1, value2, "time"); - return (Criteria) this; - } - - public Criteria andTimeNotBetween(Date value1, Date value2) { - addCriterion("TIME not between", value1, value2, "time"); - 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); - } - } -} \ No newline at end of file diff --git a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImagePoint.java b/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImagePoint.java deleted file mode 100644 index 3cf3098..0000000 --- a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImagePoint.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.hnac.hzims.videoimage.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import org.springblade.core.mp.base.BaseEntity; - -import java.math.BigDecimal; - -@TableName("image_point") -public class ImagePoint extends BaseEntity { - private String stcd; - - private Integer pno; - - private String stnm; - - private Double lgtd; - - private Double ltid; - - private String address; - - private String remark; - - private String defaultimagepath; - - private Integer open; - - public String getStcd() { - return stcd; - } - - public void setStcd(String stcd) { - this.stcd = stcd == null ? null : stcd.trim(); - } - - public Integer getOpen() { - return open; - } - - public void setOpen(Integer open) { - this.open = open; - } - - public Integer getPno() { - return pno; - } - - public void setPno(Integer pno) { - this.pno = pno; - } - - public String getStnm() { - return stnm; - } - - public void setStnm(String stnm) { - this.stnm = stnm == null ? null : stnm.trim(); - } - - public Double getLgtd() { - return lgtd; - } - - public void setLgtd(Double lgtd) { - if(lgtd!=null){ - lgtd = new BigDecimal(lgtd).setScale(6,BigDecimal.ROUND_CEILING).doubleValue(); - } - this.lgtd = lgtd; - } - - public Double getLtid() { - return ltid; - } - - public void setLtid(Double ltid) { - if(ltid!=null){ - ltid = new BigDecimal(ltid).setScale(6,BigDecimal.ROUND_CEILING).doubleValue(); - } - this.ltid = ltid; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address == null ? null : address.trim(); - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark == null ? null : remark.trim(); - } - - public String getDefaultimagepath() { - return defaultimagepath; - } - - public void setDefaultimagepath(String defaultimagepath) { - this.defaultimagepath = defaultimagepath == null ? null : defaultimagepath.trim(); - } -} \ No newline at end of file diff --git a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImagePointRelateInfo.java b/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImagePointRelateInfo.java deleted file mode 100644 index 19af260..0000000 --- a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/entity/ImagePointRelateInfo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hnac.hzims.videoimage.entity; - -import java.util.List; - -public class ImagePointRelateInfo extends ImagePoint{ - - //属性配置 - private List imageConfigs; - - //最新快照图片，只有一张 - private ImageInfo newestImageInfo; - - public List getImageConfigs() { - return imageConfigs; - } - - public void setImageConfigs(List imageConfigs) { - this.imageConfigs = imageConfigs; - } - - public ImageInfo getNewestImageInfo() { - return newestImageInfo; - } - - public void setNewestImageInfo(ImageInfo newestImageInfo) { - this.newestImageInfo = newestImageInfo; - } - - - - - - -} diff --git a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/util/Constants.java b/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/util/Constants.java deleted file mode 100644 index d53152c..0000000 --- a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/util/Constants.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hnac.hzims.videoimage.util; - -public class Constants { - - //传入空对象 - public static final int ERROR_CODE_EMPTY_OBJ = -1000; - //定义测站设备编码重复 - public static final int ERROR_CODE_DUPLICATE_STCB = -100; - //定义测站设备名称重复 - public static final int ERROR_CODE_DUPLICATE_STNM = -101; - //定义逻辑删除 - public static final Boolean DELETED = true; - //定义逻辑删除 - public static final Boolean NOT_DELETED = false; - //定义没有找到删除的记录 - public static final int ERROR_CODE_DELETE_ITEM_NOT_FOUND = -102; - //定义给同一个设备配置属性名称重复 - public static final int ERROR_CODE_DUPLICATE_DEVICE_ATTRIBUTE = -103; - //定义配置属性数据无效 - public static final int ERROR_CODE_LACK_NECESSARY_DATA = -104; - //定义测站属性数据类型 - public static final String CONSTANT_TYPE = "0"; - public static final String REAL_DATA_TYPE = "1"; - //定义更新测站设备不存在 - public static final int ERROR_CODE_UPDATE_DEVICE_NOT_EXIST = -105; - //未传递时间参数 - public static final int ERROR_CODE_NO_TIME = -106; - //已经存在同一个时刻的手动上传图片 - public static final int ERROR_CODE_DUPLICATE_MANUAL_TIME = -107; - - -} \ No newline at end of file diff --git a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/util/ConvertUtils.java b/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/util/ConvertUtils.java deleted file mode 100644 index 26428f1..0000000 --- a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/util/ConvertUtils.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.hnac.hzims.videoimage.util; - - -public class ConvertUtils { - - public static String errorCodeToMsg(int errorCode) { - String msg = ""; - switch (errorCode) { - case Constants.ERROR_CODE_EMPTY_OBJ: - msg = "空对象操作"; - break; - case Constants.ERROR_CODE_DUPLICATE_STCB: - msg = "设备编号重复"; - break; - case Constants.ERROR_CODE_DUPLICATE_STNM: - msg = "设备名称重复"; - break; - case Constants.ERROR_CODE_DELETE_ITEM_NOT_FOUND: - msg = "删除记录没有找到"; - break; - case Constants.ERROR_CODE_DUPLICATE_DEVICE_ATTRIBUTE: - msg = "配置属性名称重复"; - break; - case Constants.ERROR_CODE_LACK_NECESSARY_DATA: - msg = "缺少必要数据"; - break; - case Constants.ERROR_CODE_UPDATE_DEVICE_NOT_EXIST: - msg = "更新测站设备不存在"; - break; - case Constants.ERROR_CODE_NO_TIME: - msg = "请传入时间参数"; - break; - case Constants.ERROR_CODE_DUPLICATE_MANUAL_TIME: - msg = "已经存在当前时刻的手动上传图片"; - break; - default: - msg = "未知错误"; - break; - } - - return msg; - } -} diff --git a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/vo/ImageInfoVo.java b/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/vo/ImageInfoVo.java deleted file mode 100644 index 8530c6f..0000000 --- a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/vo/ImageInfoVo.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.videoimage.vo; - -import lombok.Data; -import com.hnac.hzims.videoimage.entity.ImageConfig; -import com.hnac.hzims.videoimage.entity.ImageInfo; - -import java.util.List; - -@Data -public class ImageInfoVo extends ImageInfo { - List list; -} diff --git a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/vo/ImagePointVo.java b/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/vo/ImagePointVo.java deleted file mode 100644 index 7094f81..0000000 --- a/hzims-service-api/video-image-api/src/main/java/com/hnac/hzims/videoimage/vo/ImagePointVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hnac.hzims.videoimage.vo; - -import com.hnac.hzims.videoimage.entity.ImagePoint; - -public class ImagePointVo extends ImagePoint { - private String deptName; - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } -} diff --git a/hzims-service-api/water-quality-api/pom.xml b/hzims-service-api/water-quality-api/pom.xml deleted file mode 100644 index c203bd2..0000000 --- a/hzims-service-api/water-quality-api/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 4.0.0 - - com.hnac.hzims - hzims-service-api - 4.0.0-SNAPSHOT - - - water-quality-api - - - 8 - 8 - UTF-8 - - - \ No newline at end of file diff --git a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqConfigD.java b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqConfigD.java deleted file mode 100644 index c69e21a..0000000 --- a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqConfigD.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hnac.hzims.waterquality.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; - -/** - *水质监测指标配置 - */ -@Data -@TableName("wq_config_d") -public class WqConfigD implements Serializable { - @ApiModelProperty("测站编码") - @TableId(type=IdType.INPUT) - private String stcd; - @ApiModelProperty("指标类型") - private String type; - @ApiModelProperty("指标值") - private String value; -} diff --git a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWfrinfB.java b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWfrinfB.java deleted file mode 100644 index 6cd688b..0000000 --- a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWfrinfB.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.hnac.hzims.waterquality.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; - - -/** - *水功能区基本信息 - */ -@Data -@TableName("wq_wfrinf_b") -@EqualsAndHashCode(callSuper = true) -public class WqWfrinfB extends BaseEntity { - @ApiModelProperty("水功能区代码") - private String wfrcd; - @ApiModelProperty("水功能区名称") - private String wfrnm; - @ApiModelProperty("流域名称") - private String bsnm; - @ApiModelProperty("水系名称") - private String hnnm; - @ApiModelProperty("河流名称") - private String rvnm; - @ApiModelProperty("水功能区起始断面名称") - private String wfrscsnm; - @ApiModelProperty("水功能区起始断面经度") - private Double wfrscslgtd; - @ApiModelProperty("水功能区起始断面纬度") - private Double wfrscslttd; - @ApiModelProperty("水功能区终止断面名称") - private String wfrecsnm; - @ApiModelProperty("水功能区终止断面经度") - private Double wfrecslgtd; - @ApiModelProperty("水功能区终止断面纬度") - private Double wfrecslttd; - - @ApiModelProperty("行政区划码") - private String addvcd; - @ApiModelProperty("水功能区长度") - private Double wfrln; - @ApiModelProperty("水功能区库容") - private Double wfrrc; - @ApiModelProperty("水功能区面积") - private Double wfrar; - @ApiModelProperty("水功能区水质目标") - private String wfrwqt; - @ApiModelProperty("水功能区功能排序") - private String wfrwfo; - @ApiModelProperty("备注") - private String nt; -} diff --git a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWqsinfB.java b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWqsinfB.java deleted file mode 100644 index 96c7c70..0000000 --- a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWqsinfB.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.hnac.hzims.waterquality.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("wq_wqsinf_b") -@EqualsAndHashCode(callSuper = true) -public class WqWqsinfB extends BaseEntity { - @ApiModelProperty("测站编码") - private String stcd; - @ApiModelProperty("测站名称") - private String stnm; - @ApiModelProperty("测站等级") - private String stgrd; - @ApiModelProperty("流域名称") - private String bsnm; - @ApiModelProperty("水系名称") - private String hnnm; - @ApiModelProperty("河流名称") - private String rvnm; - @ApiModelProperty("经度") - private Double lgtd; - @ApiModelProperty("纬度") - private Double lttd; - @ApiModelProperty("站址") - private String stlc; - @ApiModelProperty("行政区划码") - private String addvcd; - @ApiModelProperty("水资源分区码") - private String wrrcd; - @ApiModelProperty("水功能区划码") - private String wfrcd; - @ApiModelProperty("管理单位") - private String adag; - @ApiModelProperty("监测单位") - private String mnag; - @ApiModelProperty("监测频次") - private Integer mnfrq; - @ApiModelProperty("自动监测") - private Integer atmn; - @ApiModelProperty("建站年月") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date esstym; - @ApiModelProperty("撤站年月") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date wdstym; - @ApiModelProperty("备注") - private String nt; -} diff --git a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWrrinfB.java b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWrrinfB.java deleted file mode 100644 index b09563b..0000000 --- a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWrrinfB.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.hnac.hzims.waterquality.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springblade.core.mp.base.BaseEntity; - - -/** - * 水资源分区基本信息 - */ -@Data -@TableName("wq_wrrinf_b") -public class WqWrrinfB extends BaseEntity { - @ApiModelProperty("水资源分区码") - private String wrrcd; - @ApiModelProperty("水资源分区名称") - private String wrrnm; - @ApiModelProperty("水资源分区面积") - private Double wrr5r; - -} diff --git a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/feign/IWqWqsinfBClient.java b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/feign/IWqWqsinfBClient.java deleted file mode 100644 index a80f5c4..0000000 --- a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/feign/IWqWqsinfBClient.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright Example, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * Example, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.hnac.hzims.waterquality.feign; - -import com.hnac.hzims.waterquality.vo.WqWqsinfBVo; -import org.springblade.core.launch.constant.AppConstant; -import org.springblade.core.tool.api.R; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; - -/** - * Example Feign接口类 - * - * @author Chill - */ -@FeignClient( - value = AppConstant.APPLICATION_DESK_NAME -) -public interface IWqWqsinfBClient { - - String API_PREFIX = "/wqWqsinfBClient"; - String LIST = API_PREFIX + "/list"; - - /** - * 获取Example列表 - * - * @param number - * @return - */ - @GetMapping(LIST) - R> list(@RequestParam("number") Integer number); - -} diff --git a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/vo/WqWqsinfBVo.java b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/vo/WqWqsinfBVo.java deleted file mode 100644 index 9d05b72..0000000 --- a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/vo/WqWqsinfBVo.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hnac.hzims.waterquality.vo; - - -import com.hnac.hzims.waterquality.entity.WqWqsinfB; - -public class WqWqsinfBVo extends WqWqsinfB { -} diff --git a/hzims-service-api/water-rain-api/pom.xml b/hzims-service-api/water-rain-api/pom.xml deleted file mode 100644 index a919a96..0000000 --- a/hzims-service-api/water-rain-api/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 4.0.0 - - com.hnac.hzims - hzims-service-api - 4.0.0-SNAPSHOT - - - water-rain-api - - - 8 - 8 - UTF-8 - - - \ No newline at end of file diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/bo/StationResp.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/bo/StationResp.java deleted file mode 100644 index 2691c22..0000000 --- a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/bo/StationResp.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hnac.hzims.waterrain.bo; - - -import com.hnac.hzims.waterrain.entity.StStbprpB; - -public class StationResp { - private StStbprpB stStbprpB; - - private Object obj; - - public StStbprpB getStStbprpB() { - return stStbprpB; - } - - public void setStStbprpB(StStbprpB stStbprpB) { - this.stStbprpB = stStbprpB; - } - - public Object getObj() { - return obj; - } - - public void setObj(Object obj) { - this.obj = obj; - } -} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStPptnR.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStPptnR.java deleted file mode 100644 index dda2d53..0000000 --- a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStPptnR.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.waterrain.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -@Data -public class HzStPptnR implements Serializable { - private String stcd; - private Date tm; - private Double drp; -} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStRiverR.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStRiverR.java deleted file mode 100644 index d69750a..0000000 --- a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStRiverR.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hnac.hzims.waterrain.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -@Data -public class HzStRiverR implements Serializable { - private String stcd; - private Date tm; - private Double z; - private Double q; -} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStRsvrR.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStRsvrR.java deleted file mode 100644 index feb5928..0000000 --- a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStRsvrR.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hnac.hzims.waterrain.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -@Data -public class HzStRsvrR implements Serializable { - private String stcd;//测站编码 - private Date tm;//时间 - private Double rz; //水位 - private Double inq;//流量 -} - diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/ReorganizeData.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/ReorganizeData.java deleted file mode 100644 index fee68a4..0000000 --- a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/ReorganizeData.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hnac.hzims.waterrain.entity; - -import lombok.Data; - -import java.util.List; -import java.util.Map; - -@Data -public class ReorganizeData { - private String yearMonth; - private String stcd; - private String sttp; - private List> data; -} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/ReorganizeLog.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/ReorganizeLog.java deleted file mode 100644 index 355fb4a..0000000 --- a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/ReorganizeLog.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.waterrain.entity; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class ReorganizeLog implements Serializable { - private String stcd; - private String yearMonth; - private String operateUser; - private String checkUser; -} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/StStbprpB.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/StStbprpB.java deleted file mode 100644 index 5c8fb95..0000000 --- a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/StStbprpB.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.hnac.hzims.waterrain.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springblade.core.mp.base.BaseEntity; - -/** - * 水雨情测站信息表 - */ -@Data -@TableName("st_stbprp_b") -public class StStbprpB extends BaseEntity { - @ApiModelProperty("机构id") - private String orgId; - @ApiModelProperty("河流id") - private String rvid; - @ApiModelProperty("水系id") - private String hnid; - @ApiModelProperty("流域id") - private String bsid; - @ApiModelProperty("测站编码") - private String stcd; - @ApiModelProperty("测站名称") - private String stnm; - @ApiModelProperty("河流名称") - private String rvnm; - @ApiModelProperty("水系名称") - private String hnnm; - @ApiModelProperty("流域名称") - private String bsnm; - @ApiModelProperty("经度(度分秒)") - private String lgtd; - @ApiModelProperty("纬度(度分秒)") - private String lttd; - @ApiModelProperty("站址") - private String stlc; - @ApiModelProperty("行政区划码") - private String addvcd; - @ApiModelProperty("基面修正基值") - private Double mdbz; - @ApiModelProperty("基面修正参数") - private Double mdpr; - @ApiModelProperty("基面名称") - private String dtmnm; - @ApiModelProperty("基面高程") - private Double dtmel; - @ApiModelProperty("站类") - private String sttp; - @ApiModelProperty("拍报段次") - private Double dfrtms; - @ApiModelProperty("拍报项目") - private String fritm; - @ApiModelProperty("报讯等级") - private String frgrd; - @ApiModelProperty("始报年月") - private String bgfrym; - @ApiModelProperty("截报年月") - private String edfrym; - @ApiModelProperty("管理机构") - private String admauth; - @ApiModelProperty("测站岸别") - private String stbk; - @ApiModelProperty("集水面积") - private Double drna; - @ApiModelProperty("拼音码") - private String phcd; - @ApiModelProperty("数值经度") - private Double nlgtd; - @ApiModelProperty("数值纬度") - private Double nlttd; - @ApiModelProperty("水库编码") - private String rscd; -} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/enums/HistoryDataCalcTypeEnum.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/enums/HistoryDataCalcTypeEnum.java deleted file mode 100644 index a840f68..0000000 --- a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/enums/HistoryDataCalcTypeEnum.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hnac.hzims.waterrain.enums; - -public enum HistoryDataCalcTypeEnum { - ZERO(0,"整点值/最早值"), - ONE(1,"最大值"), - TWO(2,"最小值"), - THREE(3,"平均值"), - FOUR(4,"累计值/和值"), - FIVE(5,"变化值/差值"), - SIX(6,"最新值"); - - Integer strategy; - String desc; - - HistoryDataCalcTypeEnum(Integer strategy, String desc){ - this.strategy = strategy; - this.desc = desc; - } - - public Integer getStrategy() { - return strategy; - } - - public void setStrategy(Integer strategy) { - this.strategy = strategy; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } -} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/enums/WaterFlowRainEnum.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/enums/WaterFlowRainEnum.java deleted file mode 100644 index 9858933..0000000 --- a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/enums/WaterFlowRainEnum.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hnac.hzims.waterrain.enums; - -public enum WaterFlowRainEnum { - RR("RR","水库水文站"), - ZZ("ZZ","河道水位站"), - ZQ("ZQ","河道水文站"), - PP("PP","雨量站"), - - LEVEL("level","水位"), - FLOW("flow","流量"), - RAIN("rain","降水"); - private String code; - private String name; - - WaterFlowRainEnum(String code,String name){ - this.code=code; - this.name=name; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/feign/IStStbprpBClient.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/feign/IStStbprpBClient.java deleted file mode 100644 index 13c92ea..0000000 --- a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/feign/IStStbprpBClient.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hnac.hzims.waterrain.feign; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.hnac.hzims.waterrain.entity.StStbprpB; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; - -import java.util.List; - -@FeignClient( - value = "water-rain-monitor", - url = "${feign.water-rain-monitor:}" -) -public interface IStStbprpBClient { - String API_PREFIX = "/stStbprpBClient"; - String DETAIL = API_PREFIX + "/detail"; - String LIST = API_PREFIX + "/list"; - - /** - * 获取测站详情 - * @return - */ - @GetMapping(DETAIL) - StStbprpB detail(LambdaQueryWrapper wrapper); - - @GetMapping(LIST) - List list(LambdaQueryWrapper wrapper); -} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/feign/IStStbprpBDataClient.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/feign/IStStbprpBDataClient.java deleted file mode 100644 index 091e381..0000000 --- a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/feign/IStStbprpBDataClient.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hnac.hzims.waterrain.feign; - -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; - -import java.util.Date; -import java.util.Map; - -@FeignClient( - value = "water-rain-monitor", - url = "${feign.water-rain-monitor:}" -) -public interface IStStbprpBDataClient { - String API_PREFIX = "/stStbprpBDataClient"; - String QUERYMAXORMIN = API_PREFIX + "/queryMaxOrMin"; - - @GetMapping(QUERYMAXORMIN) - Map queryMaxOrMin(String deviceCode, Date startTime, Date endTime, Integer calcType,Integer saveTimeType,Integer timeInterval, String col); -} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/vo/StStbprpBVo.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/vo/StStbprpBVo.java deleted file mode 100644 index 8d1dfb8..0000000 --- a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/vo/StStbprpBVo.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.hnac.hzims.waterrain.vo; - -import com.hnac.hzims.waterrain.entity.StStbprpB; -import lombok.Data; - -@Data -public class StStbprpBVo extends StStbprpB { - private String sttpName; -} diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpReceivesMapper.xml b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpReceivesMapper.xml index 29c592e..5cfb451 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpReceivesMapper.xml +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpReceivesMapper.xml @@ -45,7 +45,7 @@ wt_sp_receives wr JOIN wt_sp_warehouse sw ON wr.STORAGE_ROOM = sw.id - and wr.code = #{params.code} + and wr.code like concat('%',#{params.code},'%') and wr.CREATE_USER = #{params.createUser} diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java index f9dbf68..74bf8bb 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java @@ -1,6 +1,5 @@ package com.hnac.hzims.spare.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzims.spare.entity.SpTemporaryStockDetailEntity; import com.hnac.hzims.spare.entity.WtSpBasicEntity; import com.hnac.hzims.spare.vo.WtSpBasicVO; @@ -15,7 +14,7 @@ import java.util.Map; * * @author Chill */ -public interface WtSpBasicMapper extends BaseMapper { +public interface WtSpBasicMapper extends UserDataScopeBaseMapper { /** * 备品备件基础信息列表 * @param params diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java index fa00a7c..3a3bcb4 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java @@ -14,14 +14,13 @@ import com.hnac.hzims.spare.vo.WtSpBasicVO; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springblade.core.launch.constant.FlowConstant; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.support.Kv; +import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.core.tool.utils.StringUtil; import org.springblade.system.entity.Dept; import org.springblade.system.feign.IDictBizClient; @@ -31,7 +30,6 @@ import org.springblade.system.user.feign.IUserClient; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -39,7 +37,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * 服务实现类 @@ -246,7 +243,11 @@ public class SpAllocationServiceImpl extends BaseServiceImpl data = new ArrayList<>(); List error = new ArrayList<>(); error = JSONArray.parseArray(JSON.toJSONString(entityList), WtSpBasicEntity.class).stream() - .filter(entity -> Func.isEmpty(entity.getName())).collect(Collectors.toList()); + .filter(entity -> Func.isEmpty(entity.getCode())).collect(Collectors.toList()); data = JSONArray.parseArray(JSON.toJSONString(entityList), WtSpBasicEntity.class).stream() - .filter(entity -> Func.isNotEmpty(entity.getName())).collect(Collectors.toList()); + .filter(entity -> Func.isNotEmpty(entity.getCode())).collect(Collectors.toList()); Assert.isTrue(CollectionUtil.isEmpty(error), () -> { throw new ServiceException("填入工器具编码不能为空"); }); @@ -567,7 +567,7 @@ public class WtSpBasicServiceImpl extends BaseServiceImpl r = this.validExcel(libraryExcel, codeList, counter); - if (r.getMsg()!=null|| !r.isSuccess()) { + if ( !r.isSuccess()) { return r; } } diff --git a/hzims-service/base-info/pom.xml b/hzims-service/base-info/pom.xml deleted file mode 100644 index e5e862e..0000000 --- a/hzims-service/base-info/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - 4.0.0 - - com.hnac.hzims - hzims-service - 4.0.0-SNAPSHOT - - - base-info - - - 8 - 8 - UTF-8 - - - - - - com.hnac.hzims - base-info-api - ${hzims.project.version} - - - org.springblade - blade-common - - - - org.springblade - blade-core-boot - - - org.springblade - blade-starter-swagger - - - org.springblade - blade-core-test - test - - - org.springblade - blade-core-auto - provided - - - - - - com.baomidou - mybatis-plus-generator - - - - - org.apache.velocity - velocity-engine-core - 2.2 - - - - \ No newline at end of file diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/BaseInfoApplication.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/BaseInfoApplication.java deleted file mode 100644 index eb1d8f3..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/BaseInfoApplication.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.hnac.hzims.baseinfo; - -import org.mybatis.spring.annotation.MapperScan; -import org.springblade.core.cloud.feign.EnableBladeFeign; -import org.springblade.core.launch.BladeApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.cloud.client.SpringCloudApplication; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.scheduling.annotation.EnableScheduling; - -//基础信息模块 电站 水库 大坝信息管理 -@EnableBladeFeign(basePackages = {"org.springblade", "com.hnac"}) -@SpringCloudApplication -@MapperScan("com.hnac.hzims.**.mapper.**") -@EnableScheduling -@ComponentScan(basePackages = {"com.hnac.hzims.*"}) -public class BaseInfoApplication extends SpringBootServletInitializer { - - - static { - System.setProperty("spring.cloud.nacos.discovery.server-addr", "http://hadoop:8848"); - System.setProperty("spring.cloud.nacos.config.server-addr", "http://hadoop:8848"); - System.setProperty("spring.cloud.nacos.username", "nacos"); - System.setProperty("spring.cloud.nacos.password", "nacos"); - } - - - public final static String APP_NAME = "base-info"; - - public static void main(String[] args) { -// System.setProperty("nacos.standalone", "true"); - BladeApplication.run(APP_NAME, BaseInfoApplication.class, args); - } - - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - return BladeApplication.createSpringApplicationBuilder(builder, APP_NAME, BaseInfoApplication.class); - } -} \ No newline at end of file diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/controller/IrrBIReachController.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/controller/IrrBIReachController.java deleted file mode 100644 index e39a843..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/controller/IrrBIReachController.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.hnac.hzims.baseinfo.controller; - - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hnac.hzims.baseinfo.entity.IrrBIReach; -import com.hnac.hzims.baseinfo.service.IrrBIReachService; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; - -@RestController -@Api(description = "河流控制器") -@RequestMapping(value = "/area/irrBIReach/info") -public class IrrBIReachController { - @Autowired - private IrrBIReachService irs; - -// @ApiOperation(notes = "加载所有河流记录，不区分站点", value = "河流列表接口") -// @RequestMapping(value = "bindIrrBIReachs", method = RequestMethod.GET) -// @ResponseBody -// public R bindIrrBIReachs(@ApiParam(value = "名称") @RequestParam(required = false) String riverName, -// @ApiParam(value = "分页参数") @ModelAttribute PageParam pageParam) { -// R res = new R(); -// if(riverName!=null && "".equals(riverName)){ -// if(riverName.length() > 50){ -// res.setFailure("名称长度不能大于50","500"); -// } -// } -// res.setSuccess(irs.bindIrrBIReachs(riverName, pageParam)); -// return res; -// } - - @ApiOperation(notes = "加载所有河流记录，不区分站点", value = "河流列表接口") - @RequestMapping(value = "bindIrrBIReachs", method = RequestMethod.GET) - @ResponseBody - public R bindIrrBIReachs(@ApiParam(value = "名称") @RequestParam(required = false) String riverName, - @ApiParam(value = "分页参数") @ModelAttribute Query query) { - Page page = new Page<>(query.getCurrent(), query.getSize()); - R res = new R(); - if(riverName!=null && "".equals(riverName)){ - if(riverName.length() > 50){ - res.setMsg("名称长度不能大于50"); - res.setCode(500); - } - } - res.setData(irs.bindIrrBIReachs(riverName, page)); - return res; - } - - @ApiOperation(notes = "获取单条河流的信息接口", value = "获取单条河流的信息接口") - @RequestMapping(value = "getIrrBIReach", method = RequestMethod.GET) - @ResponseBody - public R getIrrBIReach(@RequestParam(required = true) @ApiParam(value = "河流编号") String riverCode) { - R res = new R(); - res.setData(irs.getIrrBIReach(riverCode)); - return res; - } - - @ApiOperation(notes = "编辑时编号不能修改", value = "河流信息修改接口") - @RequestMapping(value = "editIrrBIReach", method = RequestMethod.POST) - @ResponseBody - public R editIrrBIReach(@ApiParam(value = "河流") @RequestBody IrrBIReach irrBIReach) { - return irs.addOrEditIrrBIReach(irrBIReach,"update"); - } - - @ApiOperation(notes = "删除河流接口", value = "删除河流接口") - @RequestMapping(value = "delIrrBIReach", method = { RequestMethod.GET, RequestMethod.POST }) - @ResponseBody - public R delIrrBIReach(@RequestParam(required = true) @ApiParam(value = "河流编号") String riverCode) { - R res = new R(); - irs.delIrrBIReach(riverCode); - res.setMsg("操作成功"); - return res; - } - - @ApiOperation(notes = " 新增时编号需要做唯一性验证 ", value = "新增河流接口") - @RequestMapping(value = "addIrrBIReach", method = RequestMethod.POST) - @ResponseBody - public R addIrrBIReach(@ApiParam(value = "河流") @RequestBody IrrBIReach vo) { - return irs.addOrEditIrrBIReach(vo,"add"); - } -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/controller/ReservoirInfoController.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/controller/ReservoirInfoController.java deleted file mode 100644 index 3555c2a..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/controller/ReservoirInfoController.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.hnac.hzims.baseinfo.controller; - - -import com.hnac.hzims.baseinfo.service.ReservoirInfoService; -import com.hnac.hzims.baseinfo.vo.ReservoirInfoVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import sun.reflect.generics.tree.VoidDescriptor; - -import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.List; - -@RestController -@Api(description = "水库档案控制器") -@RequestMapping(value = "/reservoir/info") -public class ReservoirInfoController { - - @Autowired - private ReservoirInfoService reservoirInfoService; - - - @ApiOperation(notes = "加载所有水库记录，区分站点", value = "水库列表接口") - @RequestMapping(value = "bindReservoirs", method = RequestMethod.GET) - @ResponseBody - public R bindReservoirs(HttpServletRequest request, - @ApiParam(value = "名称") @RequestParam(required = false) String name, - @ApiParam(value = "站点ID") @RequestParam String stationId, - @ApiParam(value = "区域编码") @RequestParam(required = false) String areaCode, - @ApiParam(value = "河流编码") @RequestParam(required = false) String riverCode, - @ApiParam(value = "分页参数") @ModelAttribute Query query) { - List stationIds = new ArrayList(); - //查询当前用户下所有站点的水库列表 - if(stationId.equals("ALL")){ - - }else{ - stationIds.add(stationId); - } - - String tmpAreaCode =""; - if(areaCode!=null) { - tmpAreaCode = areaCode.replaceAll("0+$", ""); - } - return R.data(reservoirInfoService.bindReservoirList(name,tmpAreaCode,riverCode, stationIds, query)); - } - - - @ApiOperation(notes = "获取单条水库的信息接口", value = "获取单条水库的信息接口") - @RequestMapping(value = "getReservoir", method = RequestMethod.GET) - @ResponseBody - public R getReservoir(@RequestParam(required = true) @ApiParam(value = "水库编号") String stcd) { - return R.data(reservoirInfoService.getReservoir(stcd)); - } - - @ApiOperation(notes = "水库信息修改接口", value = "水库信息修改接口") - @RequestMapping(value = "editReservoir", method = RequestMethod.POST) - @ResponseBody - public R editReservoir(@ApiParam(value = "水库信息") @RequestBody ReservoirInfoVo reservoirInfoVo) { - - return reservoirInfoService.addOrEditReservoir(reservoirInfoVo,"update"); - - } - - @ApiOperation(notes = "删除水库接口", value = "删除水库接口") - @RequestMapping(value = "delReservoir", method = { RequestMethod.GET, RequestMethod.POST }) - @ResponseBody - public R delReservoir(@RequestParam(required = true) @ApiParam(value = "水库编号") String stcd) { - - return reservoirInfoService.delReservoir(stcd); - - } - - @ApiOperation(notes = "新增水库接口", value = "新增水库接口") - @RequestMapping(value = "addReservoir", method = { RequestMethod.POST }) - @ResponseBody - public R addReservoir(@ApiParam(value = "水库") @RequestBody ReservoirInfoVo vo) { - return reservoirInfoService.addOrEditReservoir(vo,"add"); - } - - - - -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/controller/ReservoirRefdataController.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/controller/ReservoirRefdataController.java deleted file mode 100644 index 8defce9..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/controller/ReservoirRefdataController.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hnac.hzims.baseinfo.controller; - - -import com.hnac.hzims.baseinfo.entity.ReservoirRefdata; -import com.hnac.hzims.baseinfo.service.ReservoirRefDataService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@Api(description = "水库数据扩展表控制器") -@RequestMapping(value = "/reservoir/refdata") -public class ReservoirRefdataController { - @Autowired - private ReservoirRefDataService reservoirRefDataService; - - @ApiOperation(notes = "stcd必须真实", value = "水库数据扩展配置接口") - @RequestMapping(value = "configReservoirRefData", method = RequestMethod.POST) - @ResponseBody - public R configReservoirRefData( - @ApiParam(value = "水库信息") @RequestBody ReservoirRefdata reservoirRefdata) { - reservoirRefDataService.configReservoirRefData(reservoirRefdata); - return R.success("操作成功"); - } - - @ApiOperation(notes = "stcd必须真实", value = "水库数据扩展获得接口") - @RequestMapping(value = "getReservoirRefData", method = {RequestMethod.POST, RequestMethod.GET}) - @ResponseBody - public R getReservoirRefData(@ApiParam(value = "水库编码") String stcd) { - return R.data(reservoirRefDataService.getReservoirRefData(stcd)); - } -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/controller/StZvarlBController.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/controller/StZvarlBController.java deleted file mode 100644 index 3f2bc62..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/controller/StZvarlBController.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hnac.hzims.baseinfo.controller; - - -import com.hnac.hzims.baseinfo.entity.StZvarlB; -import com.hnac.hzims.baseinfo.service.StZvarlBService; -import com.hnac.hzims.common.utils.Condition; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.math.BigDecimal; - -@RestController -@Api(description = "库(湖)容曲线控制器") -@RequestMapping(value = "/reservoir/stZvarlB") -public class StZvarlBController { - - @Autowired - private StZvarlBService stZvarlBService; - - - @ApiOperation(notes = "获取库(湖)容曲线列表数据接口", value = "获取库(湖)容曲线列表数据接口") - @RequestMapping(value = "bindStZvarlBs", method = RequestMethod.GET) - @ResponseBody - public R bindStZvarlBs(@RequestParam(required = true) @ApiParam(value = "水库编号") String stcd, - @ApiParam(value = "分页参数") @ModelAttribute Query query) { - return R.data(stZvarlBService.bindStZvarlBs(stcd, Condition.getPage(query))); - } - - @ApiOperation(notes = "新增库(湖)容曲线记录接口", value = "新增库(湖)容曲线记录息接口") - @RequestMapping(value = "addStZvarlB", method = RequestMethod.POST) - @ResponseBody - public R addStZvarlB(@ApiParam(value = "库(湖)曲线对象") @RequestBody StZvarlB stZvarlB) { - - return stZvarlBService.addOrEditStZvarlB(stZvarlB); - - } - - @ApiOperation(notes = "更新库(湖)容曲线记录接口", value = "更新库(湖)容曲线记录接口") - @RequestMapping(value = "editStZvarlB", method = RequestMethod.POST) - @ResponseBody - public R editStZvarlB(@ApiParam(value = "库(湖)曲线对象") @RequestBody StZvarlB stZvarlB) { - - return stZvarlBService.addOrEditStZvarlB(stZvarlB); - - } - - @ApiOperation(notes = "删除库(湖)容曲线记录接口", value = "删除库(湖)容曲线记录接口") - @RequestMapping(value = "delStZvarlB", method = { RequestMethod.GET, RequestMethod.POST }) - @ResponseBody - public R delStZvarlB(@RequestParam(required = true) @ApiParam(value = "ID") Integer id) { - - return stZvarlBService.delStZvarlB(id); - - } - - @ApiOperation(notes = "根据库水位获取库容", value = "根据库水位获取库容") - @RequestMapping(value = "getWValue", method = { RequestMethod.GET, RequestMethod.POST }) - @ResponseBody - public R getWValue(String stcd,String rz) { - R res = new R(); - BigDecimal bd=new BigDecimal(rz); - BigDecimal data=stZvarlBService.getWValue(stcd,bd); - res.setMsg("操作成功"); - res.setData(data); - return res; - } -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/controller/WqLrinfBController.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/controller/WqLrinfBController.java deleted file mode 100644 index ea1e462..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/controller/WqLrinfBController.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.hnac.hzims.baseinfo.controller; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hnac.hzims.baseinfo.entity.WqLrinfB; -import com.hnac.hzims.baseinfo.service.WqLrinfBService; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; - -@RestController -@Api(description = "湖库控制器") -@RequestMapping(value = "/area/wqLrinfB/info") -public class WqLrinfBController { - @Autowired - private WqLrinfBService wbs; - -// @ApiOperation(notes = "加载所有湖库记录，不区分站点", value = "湖库列表接口") -// @RequestMapping(value = "bindWqLrinfBs", method = RequestMethod.GET) -// @ResponseBody -// public R bindWqLrinfBs(@ApiParam(value = "名称") @RequestParam(required = false) String lrnm, -// @ApiParam(value = "分页参数") @ModelAttribute PageParam pageParam) { -// R res = new R(); -// if(lrnm!=null && "".equals(lrnm)){ -// if(lrnm.length() > 50){ -// res.setFailure("名称长度不能大于50","500"); -// } -// } -// res.setSuccess(wbs.bindWqLrinfBs(lrnm, pageParam)); -// return res; -// } - - @ApiOperation(notes = "加载所有湖库记录，不区分站点", value = "湖库列表接口") - @RequestMapping(value = "bindWqLrinfBs", method = RequestMethod.GET) - @ResponseBody - public R bindWqLrinfBs(@ApiParam(value = "名称") @RequestParam(required = false) String lrnm, - @ApiParam(value = "分页参数") @ModelAttribute Query query) { - Page page = new Page<>(query.getCurrent(), query.getSize()); - R res = new R(); - if(lrnm!=null && "".equals(lrnm)){ - if(lrnm.length() > 50){ - res.setMsg("名称长度不能大于50"); - res.setData(500); - } - } - res.setData(wbs.bindWqLrinfBs(lrnm, page)); - return res; - } - - @ApiOperation(notes = "获取单条湖库的信息接口", value = "获取单条湖库的信息接口") - @RequestMapping(value = "getWqLrinfB", method = RequestMethod.GET) - @ResponseBody - public R getWqLrinfB(@RequestParam(required = true) @ApiParam(value = "湖库编号") String lrcd) { - R res = new R(); - res.setData(wbs.getWqLrinfB(lrcd)); - return res; - } - - @ApiOperation(notes = "编辑时编号不能修改", value = "湖库信息修改接口") - @RequestMapping(value = "editWqLrinfB", method = RequestMethod.POST) - @ResponseBody - public R editWqLrinfB(@ApiParam(value = "湖库信息") @RequestBody WqLrinfB wqLrinfB) { - - return wbs.editWqLrinfB(wqLrinfB); - - } - - @ApiOperation(notes = "删除湖库接口", value = "删除湖库接口") - @RequestMapping(value = "delWqLrinfB", method = { RequestMethod.GET, RequestMethod.POST }) - @ResponseBody - public R delWqLrinfB(@RequestParam @ApiParam(value = "湖库编号") String lrcd) { - return wbs.delWqLrinfB(lrcd); - - } - - @ApiOperation(notes = "新增时编号需要做唯一性验证", value = "新增湖库接口") - @RequestMapping(value = "addWqLrinfB", method = RequestMethod.POST ) - @ResponseBody - public R addWqLrinfB(@ApiParam(value = "湖库") @RequestBody WqLrinfB wqLrinfB) { - - return wbs.addWqLrinfB(wqLrinfB); - - } -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/FileReservoirInfoMapper.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/FileReservoirInfoMapper.java deleted file mode 100644 index 00da4b4..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/FileReservoirInfoMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hnac.hzims.baseinfo.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzims.baseinfo.entity.FileReservoirInfo; -import com.hnac.hzims.baseinfo.entity.ImageReservoirInfo; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/9 10:41 - */ -public interface FileReservoirInfoMapper extends BaseMapper { -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/ImageReservoirInfoMapper.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/ImageReservoirInfoMapper.java deleted file mode 100644 index f4ddffa..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/ImageReservoirInfoMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.baseinfo.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzims.baseinfo.entity.ImageReservoirInfo; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/9 10:40 - */ -public interface ImageReservoirInfoMapper extends BaseMapper { -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/IrrBIReachMapper.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/IrrBIReachMapper.java deleted file mode 100644 index d10aeaa..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/IrrBIReachMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hnac.hzims.baseinfo.mapper; - -import java.util.List; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.baseinfo.entity.IrrBIReach; -import com.hnac.hzims.baseinfo.entity.IrrBIReachExample; -import org.apache.ibatis.annotations.Param; - -public interface IrrBIReachMapper { - int deleteByPrimaryKey(String riverCode); - - int insert(IrrBIReach record); - - int insertSelective(IrrBIReach record); - - List selectByExample(IrrBIReachExample example); - - IrrBIReach selectByPrimaryKey(String riverCode); - - int updateByPrimaryKeySelective(IrrBIReach record); - - int updateByPrimaryKey(IrrBIReach record); - - IPage selectByRiverName(@Param("riverName")String riverName, IPage page); -} \ No newline at end of file diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/IrrBIReachMapper.xml b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/IrrBIReachMapper.xml deleted file mode 100644 index 918892e..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/IrrBIReachMapper.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - RIVER_CODE, RIVER_NAME, RIVER_WIDTH, RIVER_FLUX, COORDINATESET - - - - - delete from irrbireach - where RIVER_CODE = #{riverCode,jdbcType=CHAR} - - - insert into irrbireach (RIVER_CODE, RIVER_NAME, RIVER_WIDTH, - RIVER_FLUX, COORDINATESET) - values (#{riverCode,jdbcType=CHAR}, #{riverName,jdbcType=VARCHAR}, #{riverWidth,jdbcType=DECIMAL}, - #{riverFlux,jdbcType=DECIMAL}, #{coordinateset,jdbcType=VARCHAR}) - - - insert into irrbireach - - - RIVER_CODE, - - - RIVER_NAME, - - - RIVER_WIDTH, - - - RIVER_FLUX, - - - COORDINATESET, - - - - - #{riverCode,jdbcType=CHAR}, - - - #{riverName,jdbcType=VARCHAR}, - - - #{riverWidth,jdbcType=DECIMAL}, - - - #{riverFlux,jdbcType=DECIMAL}, - - - #{coordinateset,jdbcType=VARCHAR}, - - - - - update irrbireach - - - RIVER_NAME = #{riverName,jdbcType=VARCHAR}, - - - RIVER_WIDTH = #{riverWidth,jdbcType=DECIMAL}, - - - RIVER_FLUX = #{riverFlux,jdbcType=DECIMAL}, - - - COORDINATESET = #{coordinateset,jdbcType=VARCHAR}, - - - where RIVER_CODE = #{riverCode,jdbcType=CHAR} - - - update irrbireach - set RIVER_NAME = #{riverName,jdbcType=VARCHAR}, - RIVER_WIDTH = #{riverWidth,jdbcType=DECIMAL}, - RIVER_FLUX = #{riverFlux,jdbcType=DECIMAL}, - COORDINATESET = #{coordinateset,jdbcType=VARCHAR} - where RIVER_CODE = #{riverCode,jdbcType=CHAR} - - - - - \ No newline at end of file diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/ReservoirInfoMapper.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/ReservoirInfoMapper.java deleted file mode 100644 index 5d1f6fe..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/ReservoirInfoMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hnac.hzims.baseinfo.mapper; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.PageList; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hnac.hzims.baseinfo.entity.ReservoirInfo; -import com.hnac.hzims.baseinfo.entity.ReservoirInfoExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface ReservoirInfoMapper { - int deleteByPrimaryKey(String stcd); - - int insert(ReservoirInfo record); - - int insertSelective(ReservoirInfo record); - - List selectByExample(ReservoirInfoExample example); - - ReservoirInfo selectByPrimaryKey(String stcd); - - int updateByPrimaryKeySelective(ReservoirInfo record); - - int updateByPrimaryKey(ReservoirInfo record); - - IPage selectByNameAndStationId(@Param("name") String name, - @Param("areaCode")String areaCode, @Param("riverCode")String riverCode, - @Param("stationIds") List stationId, - Page pageBounds); - - IPage selectByNameAndStationId(@Param("name") String name, - @Param("areaCode")String areaCode,@Param("riverCode")String riverCode, - @Param("stationIds") List stationId, IPage page); -} \ No newline at end of file diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/ReservoirInfoMapper.xml b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/ReservoirInfoMapper.xml deleted file mode 100644 index 776420d..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/ReservoirInfoMapper.xml +++ /dev/null @@ -1,520 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - STCD, STATIONID, DISCHARGE, NAME, LOCATION, VILLAGE, ROADLENGTH, ROADCONDITIION, - BUILDDATE, COMPLETEDDATE, RAINAREA, DESIGNEDFLOODFLOW, CHEDKEDFLOODFLOW, DESIGNEDFILLAREA, - DESIGNEDTOTALFLOW, CHECDEDTOTALFLOW, AVERAGERAINFALL, DESIGNEDMAXFLOW, CHECKEDMAXFLOW, - VOLUME, CHECKEDFLOODLEVEL, HISTORICALMAXLEVEL, FLOODCONTROLVOLUME, DESIGNEDFLOODLEVEL, - MAXLEVELTIME, UTILIZABLEVOLUME, NORRMALLEVEL, FLOODDETENTIONVOLUME, DEADLEVEL, AREA_CODE, - LRCD, SZHLDM, DONGJ, BEIW,MJFLSSCNWL - - - - - delete from reservoir_info - where STCD = #{stcd,jdbcType=VARCHAR} - - - insert into reservoir_info (STCD, STATIONID, DISCHARGE, - NAME, LOCATION, VILLAGE, - ROADLENGTH, ROADCONDITIION, BUILDDATE, - COMPLETEDDATE, RAINAREA, DESIGNEDFLOODFLOW, - CHEDKEDFLOODFLOW, DESIGNEDFILLAREA, DESIGNEDTOTALFLOW, - CHECDEDTOTALFLOW, AVERAGERAINFALL, DESIGNEDMAXFLOW, - CHECKEDMAXFLOW, VOLUME, CHECKEDFLOODLEVEL, - HISTORICALMAXLEVEL, FLOODCONTROLVOLUME, DESIGNEDFLOODLEVEL, - MAXLEVELTIME, UTILIZABLEVOLUME, NORRMALLEVEL, - FLOODDETENTIONVOLUME, DEADLEVEL, AREA_CODE, - LRCD, SZHLDM, DONGJ, BEIW,MJFLSSCNWL - ) - values (#{stcd,jdbcType=VARCHAR}, #{stationid,jdbcType=VARCHAR}, #{discharge,jdbcType=REAL}, - #{name,jdbcType=VARCHAR}, #{location,jdbcType=VARCHAR}, #{village,jdbcType=VARCHAR}, - #{roadlength,jdbcType=REAL}, #{roadconditiion,jdbcType=VARCHAR}, #{builddate,jdbcType=DATE}, - #{completeddate,jdbcType=DATE}, #{rainarea,jdbcType=REAL}, #{designedfloodflow,jdbcType=REAL}, - #{chedkedfloodflow,jdbcType=REAL}, #{designedfillarea,jdbcType=REAL}, #{designedtotalflow,jdbcType=REAL}, - #{checdedtotalflow,jdbcType=REAL}, #{averagerainfall,jdbcType=REAL}, #{designedmaxflow,jdbcType=REAL}, - #{checkedmaxflow,jdbcType=REAL}, #{volume,jdbcType=REAL}, #{checkedfloodlevel,jdbcType=REAL}, - #{historicalmaxlevel,jdbcType=REAL}, #{floodcontrolvolume,jdbcType=REAL}, #{designedfloodlevel,jdbcType=REAL}, - #{maxleveltime,jdbcType=TIMESTAMP}, #{utilizablevolume,jdbcType=REAL}, #{norrmallevel,jdbcType=REAL}, - #{flooddetentionvolume,jdbcType=REAL}, #{deadlevel,jdbcType=REAL}, #{areaCode,jdbcType=VARCHAR}, - #{lrcd,jdbcType=VARCHAR}, #{szhldm,jdbcType=VARCHAR}, #{dongj,jdbcType=REAL}, #{beiw,jdbcType=REAL} - , #{mjflsscnwl,jdbcType=REAL} - ) - - - insert into reservoir_info - - - STCD, - - - STATIONID, - - - DISCHARGE, - - - NAME, - - - LOCATION, - - - VILLAGE, - - - ROADLENGTH, - - - ROADCONDITIION, - - - BUILDDATE, - - - COMPLETEDDATE, - - - RAINAREA, - - - DESIGNEDFLOODFLOW, - - - CHEDKEDFLOODFLOW, - - - DESIGNEDFILLAREA, - - - DESIGNEDTOTALFLOW, - - - CHECDEDTOTALFLOW, - - - AVERAGERAINFALL, - - - DESIGNEDMAXFLOW, - - - CHECKEDMAXFLOW, - - - VOLUME, - - - CHECKEDFLOODLEVEL, - - - HISTORICALMAXLEVEL, - - - FLOODCONTROLVOLUME, - - - DESIGNEDFLOODLEVEL, - - - MAXLEVELTIME, - - - UTILIZABLEVOLUME, - - - NORRMALLEVEL, - - - FLOODDETENTIONVOLUME, - - - DEADLEVEL, - - - AREA_CODE, - - - LRCD, - - - SZHLDM, - - - DONGJ, - - - BEIW, - - - MJFLSSCNWL, - - - - - #{stcd,jdbcType=VARCHAR}, - - - #{stationid,jdbcType=VARCHAR}, - - - #{discharge,jdbcType=REAL}, - - - #{name,jdbcType=VARCHAR}, - - - #{location,jdbcType=VARCHAR}, - - - #{village,jdbcType=VARCHAR}, - - - #{roadlength,jdbcType=REAL}, - - - #{roadconditiion,jdbcType=VARCHAR}, - - - #{builddate,jdbcType=DATE}, - - - #{completeddate,jdbcType=DATE}, - - - #{rainarea,jdbcType=REAL}, - - - #{designedfloodflow,jdbcType=REAL}, - - - #{chedkedfloodflow,jdbcType=REAL}, - - - #{designedfillarea,jdbcType=REAL}, - - - #{designedtotalflow,jdbcType=REAL}, - - - #{checdedtotalflow,jdbcType=REAL}, - - - #{averagerainfall,jdbcType=REAL}, - - - #{designedmaxflow,jdbcType=REAL}, - - - #{checkedmaxflow,jdbcType=REAL}, - - - #{volume,jdbcType=REAL}, - - - #{checkedfloodlevel,jdbcType=REAL}, - - - #{historicalmaxlevel,jdbcType=REAL}, - - - #{floodcontrolvolume,jdbcType=REAL}, - - - #{designedfloodlevel,jdbcType=REAL}, - - - #{maxleveltime,jdbcType=TIMESTAMP}, - - - #{utilizablevolume,jdbcType=REAL}, - - - #{norrmallevel,jdbcType=REAL}, - - - #{flooddetentionvolume,jdbcType=REAL}, - - - #{deadlevel,jdbcType=REAL}, - - - #{areaCode,jdbcType=VARCHAR}, - - - #{lrcd,jdbcType=VARCHAR}, - - - #{szhldm,jdbcType=VARCHAR}, - - - #{dongj,jdbcType=REAL}, - - - #{beiw,jdbcType=REAL}, - - - #{mjflsscnwl,jdbcType=REAL}, - - - - - update reservoir_info - - - STATIONID = #{stationid,jdbcType=VARCHAR}, - - - DISCHARGE = #{discharge,jdbcType=REAL}, - - - NAME = #{name,jdbcType=VARCHAR}, - - - LOCATION = #{location,jdbcType=VARCHAR}, - - - VILLAGE = #{village,jdbcType=VARCHAR}, - - - ROADLENGTH = #{roadlength,jdbcType=REAL}, - - - ROADCONDITIION = #{roadconditiion,jdbcType=VARCHAR}, - - - BUILDDATE = #{builddate,jdbcType=DATE}, - - - COMPLETEDDATE = #{completeddate,jdbcType=DATE}, - - - RAINAREA = #{rainarea,jdbcType=REAL}, - - - DESIGNEDFLOODFLOW = #{designedfloodflow,jdbcType=REAL}, - - - CHEDKEDFLOODFLOW = #{chedkedfloodflow,jdbcType=REAL}, - - - DESIGNEDFILLAREA = #{designedfillarea,jdbcType=REAL}, - - - DESIGNEDTOTALFLOW = #{designedtotalflow,jdbcType=REAL}, - - - CHECDEDTOTALFLOW = #{checdedtotalflow,jdbcType=REAL}, - - - AVERAGERAINFALL = #{averagerainfall,jdbcType=REAL}, - - - DESIGNEDMAXFLOW = #{designedmaxflow,jdbcType=REAL}, - - - CHECKEDMAXFLOW = #{checkedmaxflow,jdbcType=REAL}, - - - VOLUME = #{volume,jdbcType=REAL}, - - - CHECKEDFLOODLEVEL = #{checkedfloodlevel,jdbcType=REAL}, - - - HISTORICALMAXLEVEL = #{historicalmaxlevel,jdbcType=REAL}, - - - FLOODCONTROLVOLUME = #{floodcontrolvolume,jdbcType=REAL}, - - - DESIGNEDFLOODLEVEL = #{designedfloodlevel,jdbcType=REAL}, - - - MAXLEVELTIME = #{maxleveltime,jdbcType=TIMESTAMP}, - - - UTILIZABLEVOLUME = #{utilizablevolume,jdbcType=REAL}, - - - NORRMALLEVEL = #{norrmallevel,jdbcType=REAL}, - - - FLOODDETENTIONVOLUME = #{flooddetentionvolume,jdbcType=REAL}, - - - DEADLEVEL = #{deadlevel,jdbcType=REAL}, - - - AREA_CODE = #{areaCode,jdbcType=VARCHAR}, - - - LRCD = #{lrcd,jdbcType=VARCHAR}, - - - SZHLDM = #{szhldm,jdbcType=VARCHAR}, - - - DONGJ = #{dongj,jdbcType=REAL}, - - - BEIW = #{beiw,jdbcType=REAL}, - - - MJFLSSCNWL = #{mjflsscnwl,jdbcType=REAL}, - - - where STCD = #{stcd,jdbcType=VARCHAR} - - - update reservoir_info - set STATIONID = #{stationid,jdbcType=VARCHAR}, - DISCHARGE = #{discharge,jdbcType=REAL}, - NAME = #{name,jdbcType=VARCHAR}, - LOCATION = #{location,jdbcType=VARCHAR}, - VILLAGE = #{village,jdbcType=VARCHAR}, - ROADLENGTH = #{roadlength,jdbcType=REAL}, - ROADCONDITIION = #{roadconditiion,jdbcType=VARCHAR}, - BUILDDATE = #{builddate,jdbcType=DATE}, - COMPLETEDDATE = #{completeddate,jdbcType=DATE}, - RAINAREA = #{rainarea,jdbcType=REAL}, - DESIGNEDFLOODFLOW = #{designedfloodflow,jdbcType=REAL}, - CHEDKEDFLOODFLOW = #{chedkedfloodflow,jdbcType=REAL}, - DESIGNEDFILLAREA = #{designedfillarea,jdbcType=REAL}, - DESIGNEDTOTALFLOW = #{designedtotalflow,jdbcType=REAL}, - CHECDEDTOTALFLOW = #{checdedtotalflow,jdbcType=REAL}, - AVERAGERAINFALL = #{averagerainfall,jdbcType=REAL}, - DESIGNEDMAXFLOW = #{designedmaxflow,jdbcType=REAL}, - CHECKEDMAXFLOW = #{checkedmaxflow,jdbcType=REAL}, - VOLUME = #{volume,jdbcType=REAL}, - CHECKEDFLOODLEVEL = #{checkedfloodlevel,jdbcType=REAL}, - HISTORICALMAXLEVEL = #{historicalmaxlevel,jdbcType=REAL}, - FLOODCONTROLVOLUME = #{floodcontrolvolume,jdbcType=REAL}, - DESIGNEDFLOODLEVEL = #{designedfloodlevel,jdbcType=REAL}, - MAXLEVELTIME = #{maxleveltime,jdbcType=TIMESTAMP}, - UTILIZABLEVOLUME = #{utilizablevolume,jdbcType=REAL}, - NORRMALLEVEL = #{norrmallevel,jdbcType=REAL}, - FLOODDETENTIONVOLUME = #{flooddetentionvolume,jdbcType=REAL}, - DEADLEVEL = #{deadlevel,jdbcType=REAL}, - AREA_CODE = #{areaCode,jdbcType=VARCHAR}, - LRCD = #{lrcd,jdbcType=VARCHAR}, - SZHLDM = #{szhldm,jdbcType=VARCHAR}, - DONGJ = #{dongj,jdbcType=REAL}, - BEIW = #{beiw,jdbcType=REAL}, - MJFLSSCNWL = #{mjflsscnwl,jdbcType=REAL} - where STCD = #{stcd,jdbcType=VARCHAR} - - - - - - \ No newline at end of file diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/ReservoirRefdataMapper.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/ReservoirRefdataMapper.java deleted file mode 100644 index 01c9ea8..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/ReservoirRefdataMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.baseinfo.mapper; - -import com.hnac.hzims.baseinfo.entity.ReservoirRefdata; -import com.hnac.hzims.baseinfo.entity.ReservoirRefdataExample; - -import java.util.List; -public interface ReservoirRefdataMapper { - int deleteByPrimaryKey(String stcd); - - int insert(ReservoirRefdata record); - - int insertSelective(ReservoirRefdata record); - - List selectByExample(ReservoirRefdataExample example); - - ReservoirRefdata selectByPrimaryKey(String stcd); - - int updateByPrimaryKeySelective(ReservoirRefdata record); - - int updateByPrimaryKey(ReservoirRefdata record); -} \ No newline at end of file diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/ReservoirRefdataMapper.xml b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/ReservoirRefdataMapper.xml deleted file mode 100644 index 41e50a5..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/ReservoirRefdataMapper.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - STCD, REFSTCD, REFQPOINT, REFZPOINT - - - - - delete from reservoir_refdata - where STCD = #{stcd,jdbcType=VARCHAR} - - - insert into reservoir_refdata (STCD, REFSTCD, REFQPOINT, - REFZPOINT) - values (#{stcd,jdbcType=VARCHAR}, #{refstcd,jdbcType=CHAR}, #{refqpoint,jdbcType=VARCHAR}, - #{refzpoint,jdbcType=CHAR}) - - - insert into reservoir_refdata - - - STCD, - - - REFSTCD, - - - REFQPOINT, - - - REFZPOINT, - - - - - #{stcd,jdbcType=VARCHAR}, - - - #{refstcd,jdbcType=CHAR}, - - - #{refqpoint,jdbcType=VARCHAR}, - - - #{refzpoint,jdbcType=CHAR}, - - - - - update reservoir_refdata - - - REFSTCD = #{refstcd,jdbcType=CHAR}, - - - REFQPOINT = #{refqpoint,jdbcType=VARCHAR}, - - - REFZPOINT = #{refzpoint,jdbcType=CHAR}, - - - where STCD = #{stcd,jdbcType=VARCHAR} - - - update reservoir_refdata - set REFSTCD = #{refstcd,jdbcType=CHAR}, - REFQPOINT = #{refqpoint,jdbcType=VARCHAR}, - REFZPOINT = #{refzpoint,jdbcType=CHAR} - where STCD = #{stcd,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/StZvarlBMapper.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/StZvarlBMapper.java deleted file mode 100644 index 7b41776..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/StZvarlBMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hnac.hzims.baseinfo.mapper; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.baseinfo.entity.StZvarlB; -import com.hnac.hzims.baseinfo.entity.StZvarlBExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -public interface StZvarlBMapper { - int deleteByPrimaryKey(Integer id); - - int insert(StZvarlB record); - - int insertSelective(StZvarlB record); - - List selectByExample(StZvarlBExample example); - - StZvarlB selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(StZvarlB record); - - int updateByPrimaryKey(StZvarlB record); - IPage selectByStcd(@Param("stcd") String stcd, IPage page); - - List selectMaxMin(StZvarlB stZvarlB); - - List selectStZvarlB(@Param("stcd") String stcd); -} \ No newline at end of file diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/StZvarlBMapper.xml b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/StZvarlBMapper.xml deleted file mode 100644 index 84cd544..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/StZvarlBMapper.xml +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - ID, STCD, MSTM, PTNO, RZ, W, WSFA, MODITIME - - - - - delete from st_zvarl_b - where ID = #{id,jdbcType=INTEGER} - - - insert into st_zvarl_b (ID, STCD, MSTM, - PTNO, RZ, W, WSFA, - MODITIME) - values (#{id,jdbcType=INTEGER}, #{stcd,jdbcType=VARCHAR}, #{mstm,jdbcType=TIMESTAMP}, - #{ptno,jdbcType=INTEGER}, #{rz,jdbcType=DECIMAL}, #{w,jdbcType=DECIMAL}, #{wsfa,jdbcType=DECIMAL}, - #{moditime,jdbcType=TIMESTAMP}) - - - insert into st_zvarl_b - - - ID, - - - STCD, - - - MSTM, - - - PTNO, - - - RZ, - - - W, - - - WSFA, - - - MODITIME, - - - - - #{id,jdbcType=INTEGER}, - - - #{stcd,jdbcType=VARCHAR}, - - - #{mstm,jdbcType=TIMESTAMP}, - - - #{ptno,jdbcType=INTEGER}, - - - #{rz,jdbcType=DECIMAL}, - - - #{w,jdbcType=DECIMAL}, - - - #{wsfa,jdbcType=DECIMAL}, - - - #{moditime,jdbcType=TIMESTAMP}, - - - - - update st_zvarl_b - - - STCD = #{stcd,jdbcType=VARCHAR}, - - - MSTM = #{mstm,jdbcType=TIMESTAMP}, - - - PTNO = #{ptno,jdbcType=INTEGER}, - - - RZ = #{rz,jdbcType=DECIMAL}, - - - W = #{w,jdbcType=DECIMAL}, - - - WSFA = #{wsfa,jdbcType=DECIMAL}, - - - MODITIME = #{moditime,jdbcType=TIMESTAMP}, - - - where ID = #{id,jdbcType=INTEGER} - - - update st_zvarl_b - set STCD = #{stcd,jdbcType=VARCHAR}, - MSTM = #{mstm,jdbcType=TIMESTAMP}, - PTNO = #{ptno,jdbcType=INTEGER}, - RZ = #{rz,jdbcType=DECIMAL}, - W = #{w,jdbcType=DECIMAL}, - WSFA = #{wsfa,jdbcType=DECIMAL}, - MODITIME = #{moditime,jdbcType=TIMESTAMP} - where ID = #{id,jdbcType=INTEGER} - - - - - - - - - \ No newline at end of file diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/WqLrinfBMapper.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/WqLrinfBMapper.java deleted file mode 100644 index 35336c3..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/WqLrinfBMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hnac.hzims.baseinfo.mapper; - -import java.util.List; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.baseinfo.entity.WqLrinfB; -import com.hnac.hzims.baseinfo.entity.WqLrinfBExample; -import org.apache.ibatis.annotations.Param; - - -public interface WqLrinfBMapper { - int deleteByPrimaryKey(String lrcd); - - int insert(WqLrinfB record); - - int insertSelective(WqLrinfB record); - - List selectByExample(WqLrinfBExample example); - - WqLrinfB selectByPrimaryKey(String lrcd); - - int updateByPrimaryKeySelective(WqLrinfB record); - - int updateByPrimaryKey(WqLrinfB record); - - IPage selectByLrnm(@Param("lrnm")String lrnm, IPage page); -} \ No newline at end of file diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/WqLrinfBMapper.xml b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/WqLrinfBMapper.xml deleted file mode 100644 index 0e4cd7a..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/mapper/WqLrinfBMapper.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - LRCD, WATP, LRNM, LRAR, RSCP, COORDINATESET - - - - - delete from wq_lrinf_b - where LRCD = #{lrcd,jdbcType=CHAR} - - - insert into wq_lrinf_b (LRCD, WATP, LRNM, LRAR, - RSCP, COORDINATESET) - values (#{lrcd,jdbcType=CHAR}, #{watp,jdbcType=CHAR}, #{lrnm,jdbcType=VARCHAR}, #{lrar,jdbcType=DECIMAL}, - #{rscp,jdbcType=DECIMAL}, #{coordinateset,jdbcType=VARCHAR}) - - - insert into wq_lrinf_b - - - LRCD, - - - WATP, - - - LRNM, - - - LRAR, - - - RSCP, - - - COORDINATESET, - - - - - #{lrcd,jdbcType=CHAR}, - - - #{watp,jdbcType=CHAR}, - - - #{lrnm,jdbcType=VARCHAR}, - - - #{lrar,jdbcType=DECIMAL}, - - - #{rscp,jdbcType=DECIMAL}, - - - #{coordinateset,jdbcType=VARCHAR}, - - - - - update wq_lrinf_b - - - WATP = #{watp,jdbcType=CHAR}, - - - LRNM = #{lrnm,jdbcType=VARCHAR}, - - - LRAR = #{lrar,jdbcType=DECIMAL}, - - - RSCP = #{rscp,jdbcType=DECIMAL}, - - - COORDINATESET = #{coordinateset,jdbcType=VARCHAR}, - - - where LRCD = #{lrcd,jdbcType=CHAR} - - - update wq_lrinf_b - set WATP = #{watp,jdbcType=CHAR}, - LRNM = #{lrnm,jdbcType=VARCHAR}, - LRAR = #{lrar,jdbcType=DECIMAL}, - RSCP = #{rscp,jdbcType=DECIMAL}, - COORDINATESET = #{coordinateset,jdbcType=VARCHAR} - where LRCD = #{lrcd,jdbcType=CHAR} - - - - \ No newline at end of file diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/FileReservoirInfoService.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/FileReservoirInfoService.java deleted file mode 100644 index 9dd9b09..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/FileReservoirInfoService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.baseinfo.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hnac.hzims.baseinfo.entity.FileReservoirInfo; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/9 10:42 - */ -public interface FileReservoirInfoService extends IService { -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/ImageReservoirInfoService.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/ImageReservoirInfoService.java deleted file mode 100644 index 896f7d7..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/ImageReservoirInfoService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.baseinfo.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hnac.hzims.baseinfo.entity.ImageReservoirInfo; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/9 10:42 - */ -public interface ImageReservoirInfoService extends IService { -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/IrrBIReachService.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/IrrBIReachService.java deleted file mode 100644 index e631b4f..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/IrrBIReachService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hnac.hzims.baseinfo.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hnac.hzims.baseinfo.entity.IrrBIReach; -import org.springblade.core.tool.api.R; - -public interface IrrBIReachService { - - IPage bindIrrBIReachs(String riverName, Page page); - - R addOrEditIrrBIReach(IrrBIReach irrBIReach, String operate); - - R delIrrBIReach(String riverCode); - - IrrBIReach getIrrBIReach(String riverCode); - -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/ReservoirInfoService.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/ReservoirInfoService.java deleted file mode 100644 index 0607b7e..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/ReservoirInfoService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hnac.hzims.baseinfo.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.baseinfo.entity.ReservoirInfo; -import com.hnac.hzims.baseinfo.vo.ReservoirInfoVo; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; - -import java.util.List; - -public interface ReservoirInfoService { - - IPage bindReservoirList(String name, String areaCode, String riverCode, - List stationIds, Query query); - - IPage bindReservoirList(String name, String areaCode, String riverCode, - List stationIds, IPage page); - - ReservoirInfoVo getReservoir(String id); - - R addOrEditReservoir(ReservoirInfoVo reservoirInfoVo, String operate); - - R delReservoir(String id); - -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/ReservoirRefDataService.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/ReservoirRefDataService.java deleted file mode 100644 index f442341..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/ReservoirRefDataService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hnac.hzims.baseinfo.service; - -import com.hnac.hzims.baseinfo.entity.ReservoirRefdata; -import com.hnac.hzims.baseinfo.vo.ReservoirRefdataVo; -import org.springblade.core.tool.api.R; - -public interface ReservoirRefDataService { - - R configReservoirRefData(ReservoirRefdata reservoirRefdata); - - R delReservoirRefData(String rstcd); - - ReservoirRefdataVo getReservoirRefData(String stcd); - -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/ReservoirWaterManageService.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/ReservoirWaterManageService.java deleted file mode 100644 index dab1fb6..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/ReservoirWaterManageService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.baseinfo.service; - - - -import com.hnac.hzims.baseinfo.entity.ReservoirWaterManage; - -import java.util.List; - -public interface ReservoirWaterManageService { - List getReservoirWaterManage(String stcd, List months); -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/StZvarlBService.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/StZvarlBService.java deleted file mode 100644 index 90530b1..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/StZvarlBService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hnac.hzims.baseinfo.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.baseinfo.entity.StZvarlB; -import org.springblade.core.tool.api.R; - - -import java.math.BigDecimal; -import java.util.List; - -public interface StZvarlBService { - - IPage bindStZvarlBs(String stcd, IPage page); - - R addOrEditStZvarlB(StZvarlB stZvarlB); - - R delStZvarlB(Integer id); - - BigDecimal getWValue(String stcd,BigDecimal rz); - //根据水库获取库容曲线 - List selectStZvarlB(String stcd); - //计算库容 - BigDecimal calcResp(List list,BigDecimal rz); - //计算小于等于rz最大 和 大于rz最小值的 水位与库容关系两个点 - List calcMaxMin(List list, BigDecimal rz); -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/WqLrinfBService.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/WqLrinfBService.java deleted file mode 100644 index 0930c3c..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/WqLrinfBService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hnac.hzims.baseinfo.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hnac.hzims.baseinfo.entity.WqLrinfB; -import org.springblade.core.tool.api.R; - -public interface WqLrinfBService { - - IPage bindWqLrinfBs(String lrnm, Page page); - - WqLrinfB getWqLrinfB(String lrcd); - - R delWqLrinfB(String lrcd); - - R editWqLrinfB(WqLrinfB wqLrinfB); - - R addWqLrinfB(WqLrinfB wqLrinfB); - -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/FileReservoirInfoServiceImpl.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/FileReservoirInfoServiceImpl.java deleted file mode 100644 index 112af3e..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/FileReservoirInfoServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hnac.hzims.baseinfo.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hnac.hzims.baseinfo.entity.FileReservoirInfo; -import com.hnac.hzims.baseinfo.mapper.FileReservoirInfoMapper; -import com.hnac.hzims.baseinfo.service.FileReservoirInfoService; -import org.springframework.stereotype.Service; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/9 10:43 - */ -@Service -public class FileReservoirInfoServiceImpl extends ServiceImpl - implements FileReservoirInfoService { -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/ImageReservoirInfoServiceImpl.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/ImageReservoirInfoServiceImpl.java deleted file mode 100644 index 21775cd..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/ImageReservoirInfoServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.baseinfo.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hnac.hzims.baseinfo.entity.FileReservoirInfo; -import com.hnac.hzims.baseinfo.entity.ImageReservoirInfo; -import com.hnac.hzims.baseinfo.mapper.FileReservoirInfoMapper; -import com.hnac.hzims.baseinfo.mapper.ImageReservoirInfoMapper; -import com.hnac.hzims.baseinfo.service.FileReservoirInfoService; -import com.hnac.hzims.baseinfo.service.ImageReservoirInfoService; -import org.springframework.stereotype.Service; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/9 10:46 - */ -@Service -public class ImageReservoirInfoServiceImpl extends ServiceImpl - implements ImageReservoirInfoService { -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/IrrBIReachServiceImpl.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/IrrBIReachServiceImpl.java deleted file mode 100644 index 79c6ef8..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/IrrBIReachServiceImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.hnac.hzims.baseinfo.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hnac.hzims.baseinfo.entity.IrrBIReach; -import com.hnac.hzims.baseinfo.mapper.IrrBIReachMapper; -import com.hnac.hzims.baseinfo.service.IrrBIReachService; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.alibaba.druid.util.StringUtils; -@Service -public class IrrBIReachServiceImpl implements IrrBIReachService { - @Autowired - private IrrBIReachMapper ibm; - - @Override - public IPage bindIrrBIReachs(String riverName, Page page) { - riverName = riverName == null ? "" : riverName; - IPage records = ibm.selectByRiverName(riverName, page); - return records; - } - - @Override - public R addOrEditIrrBIReach(IrrBIReach irrBIReach, String operate) { - - String riverCode = irrBIReach.getRiverCode(); - IrrBIReach model = ibm.selectByPrimaryKey(riverCode); - - if("add".equals(operate) && model!=null){ - return R.fail(500,"河流编码已存在"); - } - - int cnt = 0; - if (model != null && !StringUtils.isEmpty(model.getRiverCode())) { // edit - cnt = ibm.updateByPrimaryKey(irrBIReach); - } else { - cnt = ibm.insert(irrBIReach); - } - if (cnt < 1) { - if("add".equals(operate)) { - return R.fail(500,"新增失败"); - }else{ - return R.fail(500,"编辑失败"); - } - } - return R.success("操作成功"); - } - - @Override - public R delIrrBIReach(String riverCode) { - int cnt = 0; - cnt = ibm.deleteByPrimaryKey(riverCode); - if (cnt < 1) - return R.fail(500,"删除失败"); - return R.success("删除成功"); - } - - @Override - public IrrBIReach getIrrBIReach(String riverCode) { - return ibm.selectByPrimaryKey(riverCode); - } - -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/ReservoirInfoServiceImpl.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/ReservoirInfoServiceImpl.java deleted file mode 100644 index 5c143fd..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/ReservoirInfoServiceImpl.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.hnac.hzims.baseinfo.service.impl; - -import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hnac.hzims.baseinfo.entity.FileReservoirInfo; -import com.hnac.hzims.baseinfo.entity.ImageReservoirInfo; -import com.hnac.hzims.baseinfo.entity.ReservoirInfo; -import com.hnac.hzims.baseinfo.mapper.ReservoirInfoMapper; -import com.hnac.hzims.baseinfo.mapper.ReservoirRefdataMapper; -import com.hnac.hzims.baseinfo.service.FileReservoirInfoService; -import com.hnac.hzims.baseinfo.service.ImageReservoirInfoService; -import com.hnac.hzims.baseinfo.service.ReservoirInfoService; -import com.hnac.hzims.baseinfo.vo.ReservoirInfoVo; -import org.apache.commons.collections4.CollectionUtils; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.yaml.snakeyaml.events.Event; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -@Service -public class ReservoirInfoServiceImpl implements ReservoirInfoService { - - @Autowired - ReservoirInfoMapper reservoirInfoMapper; - @Autowired - private ReservoirRefdataMapper rrm; - - @Autowired - private ImageReservoirInfoService imageReservoirInfoService; - @Autowired - private FileReservoirInfoService fileReservoirInfoService; - - @Override - public ReservoirInfoVo getReservoir(String id) { - ReservoirInfo info = null; - ReservoirInfoVo infoVo = null; - info = reservoirInfoMapper.selectByPrimaryKey(id); - if (info != null) { - infoVo = new ReservoirInfoVo(info); - } - //查询图片 - List imageReservoirInfoList = imageReservoirInfoService.list(new LambdaQueryWrapper() - .eq(ImageReservoirInfo::getReservoirInfoId, id)); - if (CollectionUtils.isNotEmpty(imageReservoirInfoList)) { - infoVo.setImageReservoirInfoList(imageReservoirInfoList); - } - - //查询文件 - List fileReservoirInfoList = - fileReservoirInfoService.list(new LambdaQueryWrapper() - .eq(FileReservoirInfo::getReservoirInfoId, id)); - if (CollectionUtils.isNotEmpty(fileReservoirInfoList)) { - infoVo.setFileReservoirInfoList(fileReservoirInfoList); - } - - return infoVo; - } - - @Override - public R addOrEditReservoir(ReservoirInfoVo reservoirInfoVo, String operate) { - int cnt = 0; - ReservoirInfo ri = new ReservoirInfo(reservoirInfoVo); - String stcd = ri.getStcd(); - ReservoirInfo info = reservoirInfoMapper.selectByPrimaryKey(stcd); - - if ("add".equals(operate) && info != null) { - return R.fail(500, "水库编码已存在"); - } - - if (info != null && !StringUtils.isEmpty(info.getStcd())) { // edit - cnt = reservoirInfoMapper.updateByPrimaryKey(ri); - if (!info.getStationid().equals(reservoirInfoVo.getStationid())) { //编辑时站点更换清除之前数据配置 - rrm.deleteByPrimaryKey(info.getStcd()); - } - } else { // add - cnt = reservoirInfoMapper.insert(ri); - } - if (cnt < 1) { - return R.fail(500, "操作失败"); - } - - - if ("update".equals(operate)) { - //删除图片 - imageReservoirInfoService.remove(new LambdaQueryWrapper() - .eq(ImageReservoirInfo::getReservoirInfoId, stcd)); - //删除文件 - fileReservoirInfoService.remove(new LambdaQueryWrapper() - .eq(FileReservoirInfo::getReservoirInfoId, stcd)); - - } - - //图片 - List imageReservoirInfoList = reservoirInfoVo.getImageReservoirInfoList(); - if (CollectionUtils.isNotEmpty(imageReservoirInfoList)) { - imageReservoirInfoList.stream().map(item -> { - item.setReservoirInfoId(stcd); - return item; - }).collect(Collectors.toList()); - imageReservoirInfoService.saveOrUpdateBatch(imageReservoirInfoList); - } - - //文件 - List fileReservoirInfoList = reservoirInfoVo.getFileReservoirInfoList(); - if (CollectionUtils.isNotEmpty(fileReservoirInfoList)) { - fileReservoirInfoList.stream().map(item -> { - item.setReservoirInfoId(stcd); - return item; - }).collect(Collectors.toList()); - fileReservoirInfoService.saveOrUpdateBatch(fileReservoirInfoList); - } - return R.success("操作成功"); - } - - @Override - public R delReservoir(String stcd) { - int cnt = reservoirInfoMapper.deleteByPrimaryKey(stcd); - rrm.deleteByPrimaryKey(stcd); - - //删除图片 - imageReservoirInfoService.remove( - new LambdaQueryWrapper().eq(ImageReservoirInfo::getReservoirInfoId, stcd)); - - //删除文集 - fileReservoirInfoService.remove( - new LambdaQueryWrapper().eq(FileReservoirInfo::getReservoirInfoId, stcd)); - - if (cnt < 1) - return R.fail(500, "删除失败"); - return R.success("删除成功"); - } - - @Override - public IPage bindReservoirList(String name, String areaCode, String riverCode, - List stationIds, Query query) { - Page reservoirInfoPage = new Page<>(query.getCurrent(), query.getSize()); - IPage records = reservoirInfoMapper - .selectByNameAndStationId(name, areaCode, riverCode, stationIds, reservoirInfoPage); - - IPage resultPage = new Page<>(records.getCurrent(), records.getSize()); - List reservoirInfoVos = new ArrayList<>(); - for (ReservoirInfo record : records.getRecords()) { - ReservoirInfoVo reservoirInfoVo = new ReservoirInfoVo(); - BeanUtils.copyProperties(record, reservoirInfoVo); - //查询图片 - List imageReservoirInfoList = imageReservoirInfoService.list(new LambdaQueryWrapper() - .eq(ImageReservoirInfo::getReservoirInfoId, record.getStcd())); - if (CollectionUtils.isNotEmpty(imageReservoirInfoList)) { - reservoirInfoVo.setImageReservoirInfoList(imageReservoirInfoList); - } - - //查询文件 - List fileReservoirInfoList = - fileReservoirInfoService.list(new LambdaQueryWrapper() - .eq(FileReservoirInfo::getReservoirInfoId, record.getStcd())); - if (CollectionUtils.isNotEmpty(fileReservoirInfoList)) { - reservoirInfoVo.setFileReservoirInfoList(fileReservoirInfoList); - } - reservoirInfoVos.add(reservoirInfoVo); - } - resultPage.setRecords(reservoirInfoVos); - return resultPage; - } - - @Override - public IPage bindReservoirList(String name, String areaCode, String riverCode, List stationIds, IPage page) { - IPage records = reservoirInfoMapper - .selectByNameAndStationId(name, areaCode, riverCode, stationIds, page); - return records; - } - -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/ReservoirRefDataServiceImpl.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/ReservoirRefDataServiceImpl.java deleted file mode 100644 index 34c3869..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/ReservoirRefDataServiceImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hnac.hzims.baseinfo.service.impl; - -import com.alibaba.druid.util.StringUtils; -import com.hnac.hzims.baseinfo.entity.ReservoirRefdata; -import com.hnac.hzims.baseinfo.mapper.ReservoirRefdataMapper; -import com.hnac.hzims.baseinfo.service.ReservoirRefDataService; -import com.hnac.hzims.baseinfo.vo.ReservoirRefdataVo; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class ReservoirRefDataServiceImpl implements ReservoirRefDataService { - @Autowired - private ReservoirRefdataMapper rrm; - - @Override - public R configReservoirRefData(ReservoirRefdata reservoirRefdata) { - String stcd = reservoirRefdata.getStcd(); - int cnt = 0; - ReservoirRefdata model = rrm.selectByPrimaryKey(stcd); - if (model != null && !StringUtils.isEmpty(model.getStcd())) { - cnt = rrm.updateByPrimaryKey(reservoirRefdata); - } else { - cnt = rrm.insert(reservoirRefdata); - } - if (cnt < 1) return R.data("500", "操作失败"); - return R.success("操作成功"); - } - - @Override - public R delReservoirRefData(String rstcd) { - int cnt = rrm.deleteByPrimaryKey(rstcd); - if (cnt < 1) { - return R.fail(500, "删除失败"); - } - return R.success("删除成功"); - } - - @Override - public ReservoirRefdataVo getReservoirRefData(String stcd) { - ReservoirRefdata info = rrm.selectByPrimaryKey(stcd); - ReservoirRefdataVo infoVo = new ReservoirRefdataVo(info); - if (info != null) { - infoVo = new ReservoirRefdataVo(info); - // if (!StringUtils.isEmpty(info.getRefqpoint())) { - // - // BasePoint dataPointDef = FacInfoFactory.getInstance().getDataPointDef(info.getRefqpoint()); - // if (dataPointDef != null) { - // infoVo.setRefqFactory(dataPointDef.getFactoryId()); - // infoVo.setRefqGroupId(dataPointDef.getGroupId()); - // } - // } - // - // if (!StringUtils.isEmpty(info.getRefzpoint())) { - // BasePoint dataPointDef = FacInfoFactory.getInstance().getDataPointDef(info.getRefzpoint()); - // if (dataPointDef != null) { - // infoVo.setRefzFactory(dataPointDef.getFactoryId()); - // infoVo.setRefzGroupId(dataPointDef.getGroupId()); - // } - // } - } - return infoVo; - } - -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/StZvarlBServiceImpl.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/StZvarlBServiceImpl.java deleted file mode 100644 index abe6e05..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/StZvarlBServiceImpl.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.hnac.hzims.baseinfo.service.impl; - -import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.baseinfo.entity.StZvarlB; -import com.hnac.hzims.baseinfo.mapper.StZvarlBMapper; -import com.hnac.hzims.baseinfo.service.StZvarlBService; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -@Service -public class StZvarlBServiceImpl implements StZvarlBService { - @Autowired - private StZvarlBMapper stZvarlBMapper; - - - @Override - public IPage bindStZvarlBs(String stcd, IPage page) { - IPage records = stZvarlBMapper.selectByStcd(stcd, page); - return records; - } - - @Override - public R addOrEditStZvarlB(StZvarlB stZvarlB) { - int cnt = 0; - Integer id = stZvarlB.getId(); - if (id == null) { - cnt = stZvarlBMapper.insert(stZvarlB); - } else { - StZvarlB info = stZvarlBMapper.selectByPrimaryKey(id); - stZvarlB.setModitime(new Date()); - if (info != null && !StringUtils.isEmpty(info.getStcd())) { // edit - cnt = stZvarlBMapper.updateByPrimaryKey(stZvarlB); - } else { // add - cnt = stZvarlBMapper.insert(stZvarlB); - } - } - if (cnt < 1) { - return R.fail(500,"操作失败"); - } - return R.success("操作成功"); - } - - @Override - public R delStZvarlB(Integer id) { - int cnt = stZvarlBMapper.deleteByPrimaryKey(id); - if (cnt < 1) - return R.fail(500,"删除失败"); - return R.success("删除成功"); - - } - - @Override - public BigDecimal getWValue(String stcd,BigDecimal rz) { - List list=selectStZvarlB(stcd); - if(list!=null && !list.isEmpty()){ - return calcResp(list,rz); - }else{ - return BigDecimal.ZERO; - } - - } - - @Override - public List selectStZvarlB(String stcd) { - return stZvarlBMapper.selectStZvarlB(stcd); - } - - @Override - public BigDecimal calcResp(List list, BigDecimal rz) { - List data=calcMaxMin(list,rz); - if(data!=null && data.size()!=2){ - return BigDecimal.ZERO; - } - StZvarlB zvarlB0=data.get(0); - StZvarlB zvarlB1=data.get(1); - return calcRespTmp(zvarlB0, zvarlB1, rz); - } - - //获取小于等于rz最大值 和 大于rz最小值的两个点 - public List calcMaxMin(List list,BigDecimal rz){ - List data=new ArrayList<>(); - //求小于等于rz最大值 - StZvarlB max=calcMax(list,rz); - if(max!=null){ - data.add(max); - } - //求大于rz最小值 - StZvarlB min=calcMin(list,rz); - if(min!=null){ - data.add(min); - } - return data; - } - - StZvarlB calcMax(List list,BigDecimal rz){ - List maxList=new ArrayList<>(); - for (StZvarlB stZvarlB:list){ - BigDecimal tmpRz=stZvarlB.getRz(); - if(tmpRz.compareTo(rz)<=0){ - maxList.add(stZvarlB); - } - } - if(maxList!=null && !maxList.isEmpty()){ - return maxList.get(maxList.size()-1); - }else{ - return null; - } - - - } - - StZvarlB calcMin(List list,BigDecimal rz){ - List minList=new ArrayList<>(); - for (StZvarlB stZvarlB:list){ - BigDecimal tmpRz=stZvarlB.getRz(); - if(tmpRz.compareTo(rz)>0){ - minList.add(stZvarlB); - } - } - if(minList!=null && !minList.isEmpty()){ - return minList.get(0); - }else{ - return null; - } - } - - - - private BigDecimal calcRespTmp(StZvarlB zvarlB0,StZvarlB zvarlB1,BigDecimal rz){ - try{ - BigDecimal data1=rz.subtract(zvarlB0.getRz()); - BigDecimal data2=zvarlB1.getRz().subtract(zvarlB0.getRz()); - BigDecimal data3 = zvarlB1.getW().subtract(zvarlB0.getW());; - Double tmp=Math.abs(data3.doubleValue()); - BigDecimal data4=data1.divide(data2).multiply(new BigDecimal(tmp)); - return zvarlB0.getW().add(data4).setScale(2, BigDecimal.ROUND_HALF_UP); - }catch (Exception e){ - return new BigDecimal("0"); - } - } - -} diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/WqLrinfBServiceImpl.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/WqLrinfBServiceImpl.java deleted file mode 100644 index a728fb5..0000000 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/WqLrinfBServiceImpl.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.hnac.hzims.baseinfo.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hnac.hzims.baseinfo.entity.WqLrinfB; -import com.hnac.hzims.baseinfo.mapper.WqLrinfBMapper; -import com.hnac.hzims.baseinfo.service.WqLrinfBService; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.alibaba.druid.util.StringUtils; - -@Service -public class WqLrinfBServiceImpl implements WqLrinfBService { - @Autowired - private WqLrinfBMapper wbm; - - - @Override - public IPage bindWqLrinfBs(String lrnm, Page page) { - lrnm = lrnm == null ? "" : lrnm; -// PageBounds pageBounds = new PageBounds(pageParam.getPageNo(), pageParam.getPageSize()); - IPage records = wbm.selectByLrnm(lrnm, page); - return records; - } - - @Override - public WqLrinfB getWqLrinfB(String lrcd) { - return wbm.selectByPrimaryKey(lrcd); - } - - @Override - public R delWqLrinfB(String lrcd) { - int cnt = wbm.deleteByPrimaryKey(lrcd); - if (cnt < 1) - return R.fail(500,"删除失败"); - return R.fail("删除成功"); - } - - @Override - public R editWqLrinfB(WqLrinfB wqLrinfB) { - int cnt = 0; - String lrcd = wqLrinfB.getLrcd(); - WqLrinfB model = wbm.selectByPrimaryKey(lrcd); - if (model != null && !StringUtils.isEmpty(model.getLrcd())) { - cnt = wbm.updateByPrimaryKey(wqLrinfB); - } else { - return R.fail(500,"湖库对象不存在"); - } - if (cnt < 1) - return R.fail(500,"编辑操作失败"); - return R.success("操作成功"); - } - - @Override - public R addWqLrinfB(WqLrinfB wqLrinfB) { - int cnt = 0; - String lrcd = wqLrinfB.getLrcd(); - WqLrinfB model = wbm.selectByPrimaryKey(lrcd); - if (model == null || StringUtils.isEmpty(model.getLrcd())) { - cnt = wbm.insert(wqLrinfB); - } else { - return R.fail(500,"湖库编码已存在"); - } - if (cnt < 1) - return R.fail(500,"添加失败"); - return R.success("操作成功"); - } - -} diff --git a/hzims-service/base-info/src/main/resources/application-dev.yml b/hzims-service/base-info/src/main/resources/application-dev.yml deleted file mode 100644 index 50a4ea7..0000000 --- a/hzims-service/base-info/src/main/resources/application-dev.yml +++ /dev/null @@ -1,30 +0,0 @@ -#服务器端口 -server: - port: 8200 - -#数据源配置 -#spring: -# datasource: -# url: ${blade.datasource.dev.url} -# username: ${blade.datasource.dev.username} -# password: ${blade.datasource.dev.password} - -spring: - #排除DruidDataSourceAutoConfigure - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - datasource: - dynamic: - #设置默认的数据源或者数据源组,默认值即为master - primary: master - datasource: - master: - url: jdbc:mysql://127.0.0.1:3306/equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true - username: root - password: 123456 - slave: - url: jdbc:mysql://127.0.0.1:3306/equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true - username: root - password: 123456 -demo: - name: aaa diff --git a/hzims-service/base-info/src/main/resources/application-prod.yml b/hzims-service/base-info/src/main/resources/application-prod.yml deleted file mode 100644 index da89262..0000000 --- a/hzims-service/base-info/src/main/resources/application-prod.yml +++ /dev/null @@ -1,28 +0,0 @@ -#服务器端口 -server: - port: 8200 - -#数据源配置 -#spring: -# datasource: -# url: ${blade.datasource.prod.url} -# username: ${blade.datasource.prod.username} -# password: ${blade.datasource.prod.password} - -spring: - #排除DruidDataSourceAutoConfigure - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - datasource: - dynamic: - #设置默认的数据源或者数据源组,默认值即为master - primary: master - datasource: - master: - url: ${blade.datasource.demo.master.url} - username: ${blade.datasource.demo.master.username} - password: ${blade.datasource.demo.master.password} - slave: - url: ${blade.datasource.demo.slave.url} - username: ${blade.datasource.demo.slave.username} - password: ${blade.datasource.demo.slave.password} diff --git a/hzims-service/base-info/src/main/resources/application.yml b/hzims-service/base-info/src/main/resources/application.yml deleted file mode 100644 index aa52542..0000000 --- a/hzims-service/base-info/src/main/resources/application.yml +++ /dev/null @@ -1,21 +0,0 @@ -spring: - profiles: - active: dfy - datasource: - url: jdbc:mysql://175.6.40.67:50311/blade_huoshan_business?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true - username: root - password: 123 - driver-class-name: com.mysql.jdbc.Driver -#mybatis-plus配置 -mybatis-plus: - mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml - #实体扫描，多个package用逗号或者分号分隔 -# typeAliasesPackage: com.hnac.hzims.**.entity - -#swagger扫描路径配置 -swagger: - base-packages: - - org.springbalde - - com.hnac - - diff --git a/hzims-service/dam-safety/pom.xml b/hzims-service/dam-safety/pom.xml deleted file mode 100644 index 244cf7c..0000000 --- a/hzims-service/dam-safety/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - 4.0.0 - - com.hnac.hzims - hzims-service - 4.0.0-SNAPSHOT - - - dam-safety - - - 8 - 8 - UTF-8 - - - - - - com.hnac.hzims - dam-safety-api - ${hzims.project.version} - - - org.springblade - blade-core-boot - - - org.springblade - blade-starter-swagger - - - org.springblade - blade-starter-oss-all - - - com.baomidou - dynamic-datasource-spring-boot-starter - - - org.springblade - blade-core-test - test - - - org.springblade - blade-core-auto - compile - - - com.hnac.hzinfo.data - hzinfo-data-sdk - - - org.springblade - blade-common - - - com.hnac.hzims - common-api - - - - \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/DamSafetyApplication.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/DamSafetyApplication.java deleted file mode 100644 index e86c3e0..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/DamSafetyApplication.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.hnac.hzims.damsafety; - -import org.mybatis.spring.annotation.MapperScan; -import org.springblade.core.cloud.feign.EnableBladeFeign; -import org.springblade.core.launch.BladeApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.cloud.client.SpringCloudApplication; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.scheduling.annotation.EnableScheduling; - -//大坝安全模块 -@EnableBladeFeign(basePackages = {"org.springblade","com.hnac"}) -@SpringCloudApplication -@MapperScan("com.hnac.hzims.**.mapper.**") -@EnableScheduling -@ComponentScan(basePackages = {"com.hnac.hzims.*"}) -public class DamSafetyApplication extends SpringBootServletInitializer { - public final static String APP_NAME = "dam-safety"; - - - static { - System.setProperty("spring.cloud.nacos.discovery.server-addr", "http://192.168.65.105:8848"); - System.setProperty("spring.cloud.nacos.config.server-addr", "http://192.168.65.105:8848"); - System.setProperty("spring.cloud.nacos.username", "nacos"); - System.setProperty("spring.cloud.nacos.password", "nacos"); - } - - - - public static void main(String[] args) { -// System.setProperty("nacos.standalone", "true"); - BladeApplication.run(APP_NAME, DamSafetyApplication.class, args); - } - - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - return BladeApplication.createSpringApplicationBuilder(builder, APP_NAME, DamSafetyApplication.class); - } -} \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/DamSafetyDataController.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/DamSafetyDataController.java deleted file mode 100644 index 1cb4de9..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/DamSafetyDataController.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.hnac.hzims.damsafety.controller; - -import com.hnac.hzims.damsafety.entity.TProjInfo; -import com.hnac.hzims.damsafety.service.IDamSafetyDataService; -import com.hnac.hzims.damsafety.service.ITProjInfoService; -import com.hnac.hzims.entity.Report; -import com.hnac.hzims.enums.QueryDateTypeEnum; -import com.hnac.hzims.util.CommonUtil; -import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; -import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeInstanceFieldVO; -import com.hnac.hzinfo.sdk.analyse.vo.DeviceSinglePropsValueVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springblade.common.cache.CacheNames; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.api.R; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import java.util.*; - -@RestController -@RequestMapping("/damSafety/data") -@AllArgsConstructor -@Api(value = "大坝安全数据查询接口", tags = "大坝安全数据查询接口") -public class DamSafetyDataController extends BladeController implements CacheNames { - private final IDamSafetyDataService damSafetyDataService; - - - @ApiOperation("实时数据接口") - @RequestMapping(value = "/getRealData", method = RequestMethod.GET) - public R getRealData(String deviceCode){ - List data = damSafetyDataService.getRealData(deviceCode); - return R.data(data,"查询成功"); - } - - //过程线 - @ApiOperation("基础数据报表,数据查询和统计分析使用接口") - @RequestMapping(value = "/getReportData", method = RequestMethod.GET) - public R getReportData(String deviceCode, String beginSpt, String endSpt, String type, Integer accessRules,String col){ - Map res= CommonUtil.getStartEnd(beginSpt,endSpt); - if(res == null){ - return R.data(500,false, "日期格式错误"); - } - //查询基础数据 - String[] deviceCodes=deviceCode.split(","); - Report report = damSafetyDataService.getReportData(Arrays.asList(deviceCodes),type,accessRules, res.get("begin"), res.get("end"),col); - return R.data(report,"查询成功"); - } - - @ApiOperation("大坝浸润线") - @RequestMapping(value = "/getSeepageLine", method = RequestMethod.GET) - public R getSeepageLine(String deviceCode, String beginSpt, String endSpt,String col){ - Map res= CommonUtil.getStartEnd(beginSpt,endSpt); - if(res == null){ - return R.data(500,false, "日期格式错误"); - } - //查询基础数据 - String[] deviceCodes=deviceCode.split(","); - List data = damSafetyDataService.getSeepageLine(Arrays.asList(deviceCodes), res.get("begin"), res.get("end"),col); - return R.data(data,"查询成功"); - } - - @ApiOperation("用于渗压水位过程线,相同业务场景也可用此接口") - @RequestMapping(value = "/getReportDataByDeviceCode", method = RequestMethod.GET) - public R getReportData(String deviceCode, String beginSpt, String endSpt, String type, Integer accessRules){ - Map res= CommonUtil.getStartEnd(beginSpt,endSpt); - if(res == null){ - return R.data(500,false, "日期格式错误"); - } - //查询基础数据 - Report report = damSafetyDataService.getReportDataByDeviceCode(deviceCode,type,accessRules, res.get("begin"), res.get("end")); - return R.data(report,"查询成功"); - } - - @ApiOperation("表头列") - @RequestMapping(value = "/getTableHead", method = RequestMethod.GET) - public R getTableHead(String stcd) { - //查询基础数据 - List report = damSafetyDataService.getSignages(stcd); - return R.data(report,"查询成功"); - } - - //==============================报表接口========================== - @ApiOperation("渗压年报表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rscd", value = "水库编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "deviceCode", value = "仪器模型code", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "year", value = "年份", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "col", value = "传渗压属性字段", paramType = "query", dataType = "string") - }) - @RequestMapping(value = "/getYearSpprReport", method = RequestMethod.GET) - public R getYearSpprReport(String rscd,String deviceCode,String year,String col) { - Map res= CommonUtil.getStartEnd(year+"-01-01 00:00:00",year+"-12-31 23:59:59"); - //查询基础数据 - String[] deviceCodes=deviceCode.split(","); - Map data = damSafetyDataService.getYearSpprReport(rscd,Arrays.asList(deviceCodes),res.get("begin"), res.get("end"),col); - return R.data(data,"查询成功"); - } - - //==============================报表接口========================== - @ApiOperation("渗流年报表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rscd", value = "水库编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "deviceCode", value = "仪器模型code", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "year", value = "年份", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "col", value = "传渗流属性字段", paramType = "query", dataType = "string") - }) - @RequestMapping(value = "/getYearSpqnReport", method = RequestMethod.GET) - public R getYearSpqnReport(String rscd,String deviceCode,String year,String col) { - Map res= CommonUtil.getStartEnd(year+"-01-01 00:00:00",year+"-12-31 23:59:59"); - //查询基础数据 - String[] deviceCodes=deviceCode.split(","); - Map data = damSafetyDataService.getYearSpprReport(rscd,Arrays.asList(deviceCodes),res.get("begin"), res.get("end"),col); - return R.data(data,"查询成功"); - } - - - @ApiOperation("水平位移年报表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "deviceCode", value = "仪器模型code", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "year", value = "年份", paramType = "query", dataType = "string") - }) - @RequestMapping(value = "/getYearHrdsReport", method = RequestMethod.GET) - public R getYearHrdsReport(String deviceCode,String year) { - Map res= CommonUtil.getStartEnd(year+"-01-01 00:00:00",year+"-12-31 23:59:59"); - //查询基础数据 - String[] deviceCodes=deviceCode.split(","); - Map data = damSafetyDataService.getYearHrdsReport(Arrays.asList(deviceCodes),res.get("begin"), res.get("end")); - return R.data(data,"查询成功"); - } - - @ApiOperation("垂直位移年报表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "deviceCode", value = "仪器模型code", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "year", value = "年份", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "col", value = "传垂直位移属性字段", paramType = "query", dataType = "string") - }) - @RequestMapping(value = "/getYearVrdsReport", method = RequestMethod.GET) - public R getYearVrdsReport(String deviceCode,String year,String col) { - Map res= CommonUtil.getStartEnd(year+"-01-01 00:00:00",year+"-12-31 23:59:59"); - //查询基础数据 - String[] deviceCodes=deviceCode.split(","); - Report data = damSafetyDataService.getYearVrdsReport(Arrays.asList(deviceCodes),res.get("begin"), res.get("end"),col); - return R.data(data,"查询成功"); - } - - @ApiOperation("压力(应力)年报表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "deviceCode", value = "仪器模型code", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "year", value = "年份", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "col", value = "传垂直位移属性字段", paramType = "query", dataType = "string") - }) - @RequestMapping(value = "/getYearStressReport", method = RequestMethod.GET) - public R getYearStressReport(String deviceCode,String year,String col) { - Map res= CommonUtil.getStartEnd(year+"-01-01 00:00:00",year+"-12-31 23:59:59"); - //查询基础数据 - String[] deviceCodes=deviceCode.split(","); - Report data = damSafetyDataService.getYearVrdsReport(Arrays.asList(deviceCodes),res.get("begin"), res.get("end"),col); - return R.data(data,"查询成功"); - } - - private final ITProjInfoService tProjInfoService; - @ApiOperation("大坝报表 无工程竣工日期将默认查询三年的历史数据") - @ApiImplicitParams({ - @ApiImplicitParam(name = "deviceCode", value = "仪器模型code", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "queryType", value = "year 或 month", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "yearMonth", value = "年份或者年月", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "col", value = "属性字段", paramType = "query", dataType = "string") - }) - @RequestMapping(value = "/getDamReport", method = RequestMethod.GET) - public R getDamReport(String deviceCode,String queryType,String yearMonth,String col) { - Map res = CommonUtil.getStartEnd(yearMonth + "-01-01 00:00:00", yearMonth + "-12-31 23:59:59"); - String type="month"; - if(QueryDateTypeEnum.MONTH.getQueryDateType().equals(queryType)) { - String yearMonthDay = CommonUtil.getLastDayOfMonth(yearMonth); - type="day"; - res = CommonUtil.getStartEnd(yearMonth + "-01 00:00:00", yearMonthDay + " 23:59:59"); - } - - List dd=tProjInfoService.list(); - int yearGap=3; - if(dd!=null && !dd.isEmpty()){ - Date completeDate=dd.get(0).getCompleteDate(); - if(completeDate!=null) { - yearGap = CommonUtil.getYearGap(completeDate, res.get("begin")); - } - } - //查询基础数据 - String[] deviceCodes=deviceCode.split(","); - String[] cols=col.split(","); - if(cols.length == 1) {//渗压、垂直位移 - Map data = damSafetyDataService.getDamReport(Arrays.asList(deviceCodes),type, res.get("begin"), res.get("end"), cols[0],yearGap); - return R.data(data,"查询成功"); - } - - if(cols.length == 2) {//水平位移 - Map xData = damSafetyDataService.getDamReport(Arrays.asList(deviceCodes),type, res.get("begin"), res.get("end"), cols[0],yearGap); - Map yData = damSafetyDataService.getDamReport(Arrays.asList(deviceCodes),type, res.get("begin"), res.get("end"), cols[1],yearGap); - Map data=new HashMap<>(); - data.put("xData",xData); - data.put("yData",yData); - return R.data(data,"查询成功"); - } - return null; - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/FileUploadController.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/FileUploadController.java deleted file mode 100644 index c0afe21..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/FileUploadController.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.hnac.hzims.damsafety.controller; - -import com.hnac.hzims.damsafety.service.IFileUploadService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import java.util.List; - -@RestController -@RequestMapping("/damSafety/fileUpload") -@AllArgsConstructor -@Api(value = "大坝文件上传", tags = "大坝文件上传接口") -public class FileUploadController { - - @Autowired - IFileUploadService iImageUploadService; - - @RequestMapping(value="/uploadFile", method = {RequestMethod.POST}) - @ApiOperation(notes ="上传单个文件", value = "上传单个文件") - public R addImage(@RequestParam("file") MultipartFile file){ - try { - Object path = iImageUploadService.addFile(file,"fileInfo"); - if (path!=null) { - return R.data(path); - } else { - return R.fail("操作失败"); - } - }catch (Exception e) { - return R.fail("操作失败"); - } - } - - @RequestMapping(value="/uploadFiles", method = {RequestMethod.POST}) - @ApiOperation(notes ="上传多文件", value = "上传多文件") - public R addFiles(@RequestParam("files") MultipartFile[] files){ - try { - List paths = iImageUploadService.addFiles(files,"fileInfo"); - if (paths!=null) { - return R.data(paths); - } else { - return R.fail("操作失败"); - } - }catch (Exception e) { - return R.fail("操作失败"); - } - } - - -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/TBuildingController.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/TBuildingController.java deleted file mode 100644 index 69ad800..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/TBuildingController.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.hnac.hzims.damsafety.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzims.damsafety.entity.TBuilding; -import com.hnac.hzims.damsafety.service.ITBuildingService; -import com.hnac.hzims.damsafety.util.ParamUtil; -import com.hnac.hzims.damsafety.vo.TBuildingVo; -import com.hnac.hzims.damsafety.wrapper.TBuildingWrapper; -import io.swagger.annotations.*; -import lombok.AllArgsConstructor; -import org.springblade.common.cache.CacheNames; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/damSafety/tBuilding") -@AllArgsConstructor -@Api(value = "建筑物", tags = "建筑物接口") -public class TBuildingController extends BladeController implements CacheNames { - private final ITBuildingService tBuildingService; - - - /** - * 分页 - */ - @GetMapping("/pageList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rscd", value = "水库编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "name", value = "建筑物名称", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 1) - @ApiOperation(value = "分页", notes = "传入tBuilding") - public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { - LambdaQueryWrapper wrapper= ParamUtil.conditionTBuilding(param); - IPage pages = tBuildingService.page(Condition.getPage(query), wrapper); - return R.data(TBuildingWrapper.build().pageVO(pages)); - } - - /** - * 列表 - */ - @GetMapping("/list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rscd", value = "水库编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "name", value = "建筑物名称", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 2) - @ApiOperation(value = "列表", notes = "传入tBuilding") - public R> list(@ApiIgnore @RequestParam Map param) { - LambdaQueryWrapper wrapper=ParamUtil.conditionTBuilding(param); - List list = tBuildingService.list(wrapper); - return R.data(TBuildingWrapper.build().listVO(list)); - } - - - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 3) - @ApiOperation(value = "详情", notes = "传入tBuilding") - public R detail(TBuilding tBuilding) { - TBuilding detail = tBuildingService.getOne(Condition.getQueryWrapper(tBuilding)); - return R.data(TBuildingWrapper.build().entityVO(detail)); - } - - /** - * 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入tBuilding") - public R save(@RequestBody TBuilding tBuilding) { - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - - wrapper.eq(TBuilding::getRscd,tBuilding.getRscd()); - wrapper.eq(TBuilding::getName,tBuilding.getName()); - List list = tBuildingService.list(wrapper); - if(list!=null && !list.isEmpty()){ - return R.fail("此水库中建筑物名称已存在"); - } - return R.status(tBuildingService.save(tBuilding)); - } - - /** - * 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入tBuilding") - public R update(@RequestBody TBuilding tBuilding) { - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - wrapper.eq(TBuilding::getRscd,tBuilding.getRscd()); - wrapper.eq(TBuilding::getName,tBuilding.getName()); - wrapper.ne(TBuilding::getId,tBuilding.getId()); - List list = tBuildingService.list(wrapper); - if(list!=null && !list.isEmpty()){ - return R.fail("此水库中建筑物名称已存在"); - } - return R.status(tBuildingService.updateById(tBuilding)); - } - - /** - * 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "逻辑删除", notes = "ids") - public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { - boolean temp = tBuildingService.deleteLogic(Func.toLongList(ids)); - return R.status(temp); - } - -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/TProjInfoController.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/TProjInfoController.java deleted file mode 100644 index 05154fa..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/TProjInfoController.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.hnac.hzims.damsafety.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzims.damsafety.entity.TProjInfo; -import com.hnac.hzims.damsafety.service.ITProjInfoService; -import com.hnac.hzims.damsafety.util.ParamUtil; -import com.hnac.hzims.damsafety.vo.TProjInfoVo; -import com.hnac.hzims.damsafety.wrapper.TProjInfoWrapper; -import io.swagger.annotations.*; -import lombok.AllArgsConstructor; -import org.springblade.common.cache.CacheNames; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/damSafety/tProjInfo") -@AllArgsConstructor -@Api(value = "工程信息", tags = "工程信息接口") -public class TProjInfoController extends BladeController implements CacheNames { - - private final ITProjInfoService tProjInfoService; - - /** - * 分页 - */ - @GetMapping("/pageList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rscd", value = "水库编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "projName", value = "工程名称", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "projCode", value = "工程编号", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 1) - @ApiOperation(value = "分页", notes = "传入tProjInfo") - public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { - LambdaQueryWrapper wrapper= ParamUtil.conditionTProjInfo(param); - IPage pages = tProjInfoService.page(Condition.getPage(query), wrapper); - return R.data(TProjInfoWrapper.build().pageVO(pages)); - } - - /** - * 列表 - */ - @GetMapping("/list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rscd", value = "水库编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "projName", value = "工程名称", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "projCode", value = "工程编号", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 2) - @ApiOperation(value = "列表", notes = "传入tProjInfo") - public R> list(@ApiIgnore @RequestParam Map param) { - LambdaQueryWrapper wrapper=ParamUtil.conditionTProjInfo(param); - List list = tProjInfoService.list(wrapper); - return R.data(TProjInfoWrapper.build().listVO(list)); - } - - - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 3) - @ApiOperation(value = "详情", notes = "传入tProjInfo") - public R detail(TProjInfo tProjInfo) { - TProjInfo detail = tProjInfoService.getOne(Condition.getQueryWrapper(tProjInfo)); - return R.data(TProjInfoWrapper.build().entityVO(detail)); - } - - /** - * 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入tProjInfo") - public R save(@RequestBody TProjInfo tProjInfo) { - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - wrapper.eq(TProjInfo::getProjCode,tProjInfo.getProjCode()); - List list = tProjInfoService.list(wrapper); - if(list!=null && !list.isEmpty()){ - return R.fail("工程编码已存在"); - } - - wrapper=new LambdaQueryWrapper(); - wrapper.eq(TProjInfo::getProjName,tProjInfo.getProjName()); - list = tProjInfoService.list(wrapper); - if(list!=null && !list.isEmpty()){ - return R.fail("工程名称已存在"); - } - - return R.status(tProjInfoService.save(tProjInfo)); - } - - /** - * 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入tProjInfo") - public R update(@RequestBody TProjInfo tProjInfo) { - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - wrapper.eq(TProjInfo::getProjCode,tProjInfo.getProjCode()); - wrapper.ne(TProjInfo::getId,tProjInfo.getId()); - List list = tProjInfoService.list(wrapper); - if(list!=null && !list.isEmpty()){ - return R.fail("工程编码已存在"); - } - return R.status(tProjInfoService.updateById(tProjInfo)); - } - - /** - * 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "逻辑删除", notes = "ids") - public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { - boolean temp = tProjInfoService.deleteLogic(Func.toLongList(ids)); - return R.status(temp); - } - -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/TSectionConfigController.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/TSectionConfigController.java deleted file mode 100644 index 2082b75..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/TSectionConfigController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.hnac.hzims.damsafety.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzims.damsafety.entity.TSectionConfig; -import com.hnac.hzims.damsafety.service.ITSectionConfigService; -import com.hnac.hzims.damsafety.util.ParamUtil; -import io.swagger.annotations.*; -import lombok.AllArgsConstructor; -import org.springblade.common.cache.CacheNames; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/damSafety/tSectionConfig") -@AllArgsConstructor -@Api(value = "断面配置", tags = "断面配置接口") -public class TSectionConfigController extends BladeController implements CacheNames { - private final ITSectionConfigService tSectionConfigService; - - /** - * 分页 - */ - @GetMapping("/pageList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "stcd", value = "测点编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "sectionNo", value = "断面编号", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 1) - @ApiOperation(value = "分页", notes = "传入TSectionConfig") - public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { - LambdaQueryWrapper wrapper= ParamUtil.conditionTSectionConfig(param); - IPage pages = tSectionConfigService.page(Condition.getPage(query), wrapper); - return R.data(pages); - } - - /** - * 列表 - */ - @GetMapping("/list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "stcd", value = "测点编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "sectionNo", value = "断面编号", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 2) - @ApiOperation(value = "列表", notes = "传入TSectionConfig") - public R> list(@ApiIgnore @RequestParam Map param) { - LambdaQueryWrapper wrapper=ParamUtil.conditionTSectionConfig(param); - List list = tSectionConfigService.list(wrapper); - return R.data(list); - } - - - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 3) - @ApiOperation(value = "详情", notes = "传入tSectionConfig") - public R detail(TSectionConfig tSectionConfig) { - TSectionConfig detail = tSectionConfigService.getOne(Condition.getQueryWrapper(tSectionConfig)); - return R.data(detail); - } - - /** - * 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入tSectionConfig") - public R save(@RequestBody TSectionConfig tSectionConfig) { - LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); - wrapper.eq(TSectionConfig::getStcd,tSectionConfig.getStcd()); - List list = tSectionConfigService.list(wrapper); - if(list!=null && !list.isEmpty()){ - return R.fail("该测点编号配置已存在"); - } - - return R.status(tSectionConfigService.save(tSectionConfig)); - } - - /** - * 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入tSectionConfig") - public R update(@RequestBody TSectionConfig tSectionConfig) { - return R.status(tSectionConfigService.updateById(tSectionConfig)); - } - - /** - * 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "逻辑删除", notes = "stcd") - public R remove(@ApiParam(value = "测点编号集合") @RequestParam String stcd) { - List list=Func.toStrList(stcd); - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - wrapper.in(TSectionConfig::getStcd,list); - boolean temp = tSectionConfigService.delete(wrapper); - return R.status(temp); - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpDamsBController.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpDamsBController.java deleted file mode 100644 index 0399420..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpDamsBController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.hnac.hzims.damsafety.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzims.damsafety.entity.WrpDamsB; -import com.hnac.hzims.damsafety.service.IWrpDamsBService; -import com.hnac.hzims.damsafety.util.ParamUtil; -import io.swagger.annotations.*; -import lombok.AllArgsConstructor; -import org.springblade.common.cache.CacheNames; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/damSafety/wrpDamsB") -@AllArgsConstructor -@Api(value = "断面特征点信息", tags = "断面特征点信息接口") -public class WrpDamsBController extends BladeController implements CacheNames { - private final IWrpDamsBService wrpDamsBService; - - /** - * 分页 - */ - @GetMapping("/pageList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "damcd", value = "断面编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damscd", value = "特征点编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damsnm", value = "特征点名称", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 1) - @ApiOperation(value = "分页", notes = "传入wrpDamsB") - public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { - LambdaQueryWrapper wrapper= ParamUtil.conditionWrpDamsB(param); - IPage pages = wrpDamsBService.page(Condition.getPage(query), wrapper); - return R.data(pages); - } - - /** - * 列表 - */ - @GetMapping("/list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "damcd", value = "断面编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damscd", value = "特征点编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damsnm", value = "特征点名称", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 2) - @ApiOperation(value = "列表", notes = "传入wrpDamsB") - public R> list(@ApiIgnore @RequestParam Map param) { - LambdaQueryWrapper wrapper=ParamUtil.conditionWrpDamsB(param); - List list = wrpDamsBService.list(wrapper); - return R.data(list); - } - - - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 3) - @ApiOperation(value = "详情", notes = "传入wrpDamsB") - public R detail(WrpDamsB wrpDamsB) { - WrpDamsB detail = wrpDamsBService.getOne(Condition.getQueryWrapper(wrpDamsB)); - return R.data(detail); - } - - /** - * 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入wrpDamsB") - public R save(@RequestBody WrpDamsB wrpDamsB) { - LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); - wrapper.eq(WrpDamsB::getDamscd,wrpDamsB.getDamscd()); - List list = wrpDamsBService.list(wrapper); - if(list!=null && !list.isEmpty()) { - return R.data(500,false,"特征点编号已存在"); - } - - wrapper=new LambdaQueryWrapper<>(); - wrapper.eq(WrpDamsB::getDamsnm,wrpDamsB.getDamsnm()); - list = wrpDamsBService.list(wrapper); - if(list!=null && !list.isEmpty()) { - return R.data(500,false,"特征点名称已存在"); - } - - return R.status(wrpDamsBService.save(wrpDamsB)); - } - - /** - * 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入wrpDamsB") - public R update(@RequestBody WrpDamsB wrpDamsB) { - return R.status(wrpDamsBService.updateById(wrpDamsB)); - } - - /** - * 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "逻辑删除", notes = "damscd") - public R remove(@ApiParam(value = "特征点编号集合") @RequestParam String damscd) { - List list=Func.toStrList(damscd); - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - wrapper.in(WrpDamsB::getDamscd,list); - boolean temp = wrpDamsBService.delete(wrapper); - return R.status(temp); - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpDfrSrhrdsmpController.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpDfrSrhrdsmpController.java deleted file mode 100644 index e913baa..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpDfrSrhrdsmpController.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.hnac.hzims.damsafety.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzims.damsafety.entity.WrpDfrSrhrdsmp; -import com.hnac.hzims.damsafety.service.IWrpDfrSrhrdsmpService; -import com.hnac.hzims.damsafety.util.ParamUtil; -import com.hnac.hzims.damsafety.vo.WrpDfrSrhrdsmpVo; -import com.hnac.hzims.damsafety.wrapper.WrpDfrSrhrdsmpWrapper; -import io.swagger.annotations.*; -import lombok.AllArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.springblade.common.cache.CacheNames; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/damSafety/wrpDfrSrhrdsmp") -@AllArgsConstructor -@Api(value = "水平位移监测测点", tags = "水平位移监测测点接口") -public class WrpDfrSrhrdsmpController extends BladeController implements CacheNames { - private final IWrpDfrSrhrdsmpService wrpDfrSrhrdsmpService; - - - /** - * 分页 - */ - @GetMapping("/pageList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damcd", value = "断面编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "mpcd", value = "测点编号", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 1) - @ApiOperation(value = "分页", notes = "传入wrpDfrSrhrdsmp") - public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { - LambdaQueryWrapper wrapper= ParamUtil.conditionWrpDfrSrhrdsmp(param); - IPage pages = wrpDfrSrhrdsmpService.page(Condition.getPage(query), wrapper); - return R.data(WrpDfrSrhrdsmpWrapper.build().pageVO(pages)); - } - - /** - * 列表 - */ - @GetMapping("/list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damcd", value = "断面编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "mpcd", value = "测点编号", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 2) - @ApiOperation(value = "列表", notes = "传入wrpDfrSrhrdsmp") - public R> list(@ApiIgnore @RequestParam Map param) { - LambdaQueryWrapper wrapper=ParamUtil.conditionWrpDfrSrhrdsmp(param); - List list = wrpDfrSrhrdsmpService.list(wrapper); - return R.data(WrpDfrSrhrdsmpWrapper.build().listVO(list)); - } - - - /** - * 查询水平位移断面 - */ - @GetMapping("/section") - @ApiOperationSupport(order = 2) - @ApiOperation(value = "查询水平位移断面") - public R>> section(HttpServletRequest request,String rscd) { - String deptId=request.getHeader("dept-id"); - if(StringUtils.isBlank(deptId)){ - deptId = AuthUtil.getDeptId(); - } - List> list = wrpDfrSrhrdsmpService.section(deptId,rscd); - //返回断面加仪器数据 - return R.data(list,"查询断面成功"); - } - - - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 3) - @ApiOperation(value = "详情", notes = "传入wrpDfrSrhrdsmp") - public R detail(WrpDfrSrhrdsmp wrpDfrSrhrdsmp) { - WrpDfrSrhrdsmp detail = wrpDfrSrhrdsmpService.getOne(Condition.getQueryWrapper(wrpDfrSrhrdsmp)); - return R.data(WrpDfrSrhrdsmpWrapper.build().entityVO(detail)); - } - - /** - * 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入wrpDfrSrhrdsmp") - public R save(@RequestBody WrpDfrSrhrdsmp wrpDfrSrhrdsmp) { - LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); - wrapper.eq(WrpDfrSrhrdsmp::getMpcd,wrpDfrSrhrdsmp.getMpcd()); - List list = wrpDfrSrhrdsmpService.list(wrapper); - if(list!=null && !list.isEmpty()) { - return R.data(500,false,"测点编号已存在"); - } - return R.status(wrpDfrSrhrdsmpService.save(wrpDfrSrhrdsmp)); - } - - /** - * 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入wrpDfrSrhrdsmp") - public R update(@RequestBody WrpDfrSrhrdsmp wrpDfrSrhrdsmp) { - return R.status(wrpDfrSrhrdsmpService.updateById(wrpDfrSrhrdsmp)); - } - - /** - * 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "逻辑删除", notes = "ids") - public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { - boolean temp = wrpDfrSrhrdsmpService.deleteLogic(Func.toLongList(ids)); - return R.status(temp); - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpDfrSrvrdsbpController.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpDfrSrvrdsbpController.java deleted file mode 100644 index ed4c9ca..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpDfrSrvrdsbpController.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.hnac.hzims.damsafety.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzims.damsafety.entity.WrpDfrSrvrdsbp; -import com.hnac.hzims.damsafety.service.IWrpDfrSrvrdsbpService; -import com.hnac.hzims.damsafety.util.ParamUtil; -import com.hnac.hzims.damsafety.vo.WrpDfrSrvrdsbpVo; -import com.hnac.hzims.damsafety.wrapper.WrpDfrSrvrdsbpWrapper; -import io.swagger.annotations.*; -import lombok.AllArgsConstructor; -import org.springblade.common.cache.CacheNames; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/damSafety/wrpDfrSrvrdsbp") -@AllArgsConstructor -@Api(value = "监测基点表", tags = "监测基点接口") -public class WrpDfrSrvrdsbpController extends BladeController implements CacheNames { - private final IWrpDfrSrvrdsbpService wrpDfrSrvrdsbpService; - - - /** - * 分页 - */ - @GetMapping("/pageList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rscd", value = "水库代码", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "hycncd", value = "水工建筑物id", paramType = "query", dataType = "long"), - @ApiImplicitParam(name = "bpcd", value = "基点编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "bptp", value = "基点类型", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 1) - @ApiOperation(value = "分页", notes = "传入WrpDfrSrvrdsbp") - public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { - LambdaQueryWrapper wrapper= ParamUtil.conditionWrpDfrSrvrdsbp(param); - IPage pages = wrpDfrSrvrdsbpService.page(Condition.getPage(query), wrapper); - return R.data(WrpDfrSrvrdsbpWrapper.build().pageVO(pages)); - } - - /** - * 列表 - */ - @GetMapping("/list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rscd", value = "水库代码", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "hycncd", value = "水工建筑物id", paramType = "query", dataType = "long"), - @ApiImplicitParam(name = "bpcd", value = "基点编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "bptp", value = "基点类型", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 2) - @ApiOperation(value = "列表", notes = "传入WrpDfrSrvrdsbp") - public R> list(@ApiIgnore @RequestParam Map param) { - LambdaQueryWrapper wrapper=ParamUtil.conditionWrpDfrSrvrdsbp(param); - List list = wrpDfrSrvrdsbpService.list(wrapper); - return R.data(WrpDfrSrvrdsbpWrapper.build().listVO(list)); - } - - - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 3) - @ApiOperation(value = "详情", notes = "传入wrpDfrSrvrdsbp") - public R detail(WrpDfrSrvrdsbp wrpDfrSrvrdsbp) { - WrpDfrSrvrdsbp detail = wrpDfrSrvrdsbpService.getOne(Condition.getQueryWrapper(wrpDfrSrvrdsbp)); - return R.data(WrpDfrSrvrdsbpWrapper.build().entityVO(detail)); - } - - /** - * 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入wrpDfrSrvrdsbp") - public R save(@RequestBody WrpDfrSrvrdsbp wrpDfrSrvrdsbp) { - LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); - wrapper.eq(WrpDfrSrvrdsbp::getBpcd,wrpDfrSrvrdsbp.getBpcd()); - List list = wrpDfrSrvrdsbpService.list(wrapper); - if(list!=null && !list.isEmpty()) { - return R.data(500,false,"基点编号已存在"); - } - return R.status(wrpDfrSrvrdsbpService.save(wrpDfrSrvrdsbp)); - } - - /** - * 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入wrpDfrSrvrdsbp") - public R update(@RequestBody WrpDfrSrvrdsbp wrpDfrSrvrdsbp) { - return R.status(wrpDfrSrvrdsbpService.updateById(wrpDfrSrvrdsbp)); - } - - /** - * 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "逻辑删除", notes = "ids") - public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { - boolean temp = wrpDfrSrvrdsbpService.deleteLogic(Func.toLongList(ids)); - return R.status(temp); - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpDfrSrvrdsmpController.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpDfrSrvrdsmpController.java deleted file mode 100644 index 2b5bcdb..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpDfrSrvrdsmpController.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.hnac.hzims.damsafety.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzims.damsafety.entity.WrpDfrSrvrdsmp; -import com.hnac.hzims.damsafety.service.IWrpDfrSrvrdsmpService; -import com.hnac.hzims.damsafety.util.ParamUtil; -import com.hnac.hzims.damsafety.vo.WrpDfrSrvrdsmpVo; -import com.hnac.hzims.damsafety.wrapper.WrpDfrSrvrdsmpWrapper; -import io.swagger.annotations.*; -import lombok.AllArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.springblade.common.cache.CacheNames; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/damSafety/wrpDfrSrvrdsmp") -@AllArgsConstructor -@Api(value = "垂直位移监测测点", tags = "垂直位移监测测点接口") -public class WrpDfrSrvrdsmpController extends BladeController implements CacheNames { - private final IWrpDfrSrvrdsmpService wrpDfrSrvrdsmpService; - - - /** - * 分页 - */ - @GetMapping("/pageList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damcd", value = "断面编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "mpcd", value = "测点编号", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 1) - @ApiOperation(value = "分页", notes = "传入wrpDfrSrvrdsmp") - public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { - LambdaQueryWrapper wrapper= ParamUtil.conditionWrpDfrSrvrdsmp(param); - IPage pages = wrpDfrSrvrdsmpService.page(Condition.getPage(query), wrapper); - return R.data(WrpDfrSrvrdsmpWrapper.build().pageVO(pages)); - } - - /** - * 列表 - */ - @GetMapping("/list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damcd", value = "断面编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "mpcd", value = "测点编号", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 2) - @ApiOperation(value = "列表", notes = "传入wrpDfrSrvrdsmp") - public R> list(@ApiIgnore @RequestParam Map param) { - LambdaQueryWrapper wrapper=ParamUtil.conditionWrpDfrSrvrdsmp(param); - List list = wrpDfrSrvrdsmpService.list(wrapper); - return R.data(WrpDfrSrvrdsmpWrapper.build().listVO(list)); - } - - - /** - * 查询垂直位移断面 - */ - @GetMapping("/section") - @ApiOperationSupport(order = 2) - @ApiOperation(value = "查询垂直位移断面") - public R>> section(HttpServletRequest request,String rscd) { - String deptId=request.getHeader("dept-id"); - if(StringUtils.isBlank(deptId)){ - deptId = AuthUtil.getDeptId(); - } - List> list = wrpDfrSrvrdsmpService.section(deptId,rscd); - //返回断面加仪器数据 - return R.data(list,"查询断面成功"); - } - - - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 3) - @ApiOperation(value = "详情", notes = "传入wrpDfrSrvrdsmp") - public R detail(WrpDfrSrvrdsmp wrpDfrSrvrdsmp) { - WrpDfrSrvrdsmp detail = wrpDfrSrvrdsmpService.getOne(Condition.getQueryWrapper(wrpDfrSrvrdsmp)); - return R.data(WrpDfrSrvrdsmpWrapper.build().entityVO(detail)); - } - - /** - * 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入wrpDfrSrvrdsmp") - public R save(@RequestBody WrpDfrSrvrdsmp wrpDfrSrvrdsmp) { - LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); - wrapper.eq(WrpDfrSrvrdsmp::getMpcd,wrpDfrSrvrdsmp.getMpcd()); - List list = wrpDfrSrvrdsmpService.list(wrapper); - if(list!=null && !list.isEmpty()) { - return R.data(500,false,"测点编号已存在"); - } - return R.status(wrpDfrSrvrdsmpService.save(wrpDfrSrvrdsmp)); - } - - /** - * 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入wrpDfrSrvrdsmp") - public R update(@RequestBody WrpDfrSrvrdsmp wrpDfrSrvrdsmp) { - return R.status(wrpDfrSrvrdsmpService.updateById(wrpDfrSrvrdsmp)); - } - - /** - * 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "逻辑删除", notes = "ids") - public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { - boolean temp = wrpDfrSrvrdsmpService.deleteLogic(Func.toLongList(ids)); - return R.status(temp); - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpSectionBController.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpSectionBController.java deleted file mode 100644 index 04099e5..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpSectionBController.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright Example, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * Example, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.hnac.hzims.damsafety.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzims.damsafety.entity.WrpSectionB; -import com.hnac.hzims.damsafety.service.IWrpSectionBService; -import com.hnac.hzims.damsafety.util.ParamUtil; -import com.hnac.hzims.damsafety.vo.WrpSectionBVO; -import com.hnac.hzims.damsafety.wrapper.WrpSectionBWrapper; -import io.swagger.annotations.*; -import lombok.AllArgsConstructor; -import org.springblade.common.cache.CacheNames; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import java.util.List; -import java.util.Map; - -/** - * 大坝断面控制器 - * - * @author Chill - */ -@RestController -@RequestMapping("/damSafety/wrpSectionB") -@AllArgsConstructor -@Api(value = "大坝断面", tags = "大坝断面接口") -public class WrpSectionBController extends BladeController implements CacheNames { - - private final IWrpSectionBService wrpSectionBService; - - /** - * 分页 - */ - @GetMapping("/pageList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rscd", value = "水库编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "buildingId", value = "建筑物id", paramType = "query", dataType = "long"), - @ApiImplicitParam(name = "damcd", value = "断面编码", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damnm", value = "断面名称", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "wallType", value = "防渗墙类型", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 1) - @ApiOperation(value = "分页", notes = "传入wrpSectionB") - public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { - LambdaQueryWrapper wrapper= ParamUtil.conditionWrpSectionB(param); - IPage pages = wrpSectionBService.page(Condition.getPage(query), wrapper); - return R.data(WrpSectionBWrapper.build().pageVO(pages)); - } - - /** - * 列表 - */ - @GetMapping("/list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rscd", value = "水库编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "buildingId", value = "建筑物id", paramType = "query", dataType = "long"), - @ApiImplicitParam(name = "damcd", value = "断面编码", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damnm", value = "断面名称", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "wallType", value = "防渗墙类型", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 2) - @ApiOperation(value = "列表", notes = "传入wrpSectionB") - public R> list(@ApiIgnore @RequestParam Map param) { - LambdaQueryWrapper wrapper=ParamUtil.conditionWrpSectionB(param); - List list = wrpSectionBService.list(wrapper); - return R.data(WrpSectionBWrapper.build().listVO(list)); - } - - - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 3) - @ApiOperation(value = "详情", notes = "传入wrpSectionB") - public R detail(WrpSectionB WrpSectionB) { - WrpSectionB detail = wrpSectionBService.getOne(Condition.getQueryWrapper(WrpSectionB)); - return R.data(WrpSectionBWrapper.build().entityVO(detail)); - } - - /** - * 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入wrpSectionB") - public R save(@RequestBody WrpSectionB wrpSectionB) { - LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); - wrapper.eq(WrpSectionB::getDamcd,wrpSectionB.getDamcd()); - List list = wrpSectionBService.list(wrapper); - if(list!=null && !list.isEmpty()) { - return R.data(500,false,"断面编码已存在"); - } - - wrapper=new LambdaQueryWrapper<>(); - wrapper.eq(WrpSectionB::getDamnm,wrpSectionB.getDamnm()); - list = wrpSectionBService.list(wrapper); - if(list!=null && !list.isEmpty()) { - return R.data(500,false,"断面名称已存在"); - } - - return R.status(wrpSectionBService.save(wrpSectionB)); - } - - /** - * 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入wrpSectionB") - public R update(@RequestBody WrpSectionB wrpSectionB) { - return R.status(wrpSectionBService.updateById(wrpSectionB)); - } - - /** - * 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "逻辑删除", notes = "ids") - public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { - boolean temp = wrpSectionBService.deleteLogic(Func.toLongList(ids)); - return R.status(temp); - } - -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpSpgPztbController.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpSpgPztbController.java deleted file mode 100644 index 771f2c7..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpSpgPztbController.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.hnac.hzims.damsafety.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzims.damsafety.entity.WrpSpgPztb; -import com.hnac.hzims.damsafety.service.IWrpSpgPztbService; -import com.hnac.hzims.damsafety.util.ParamUtil; -import com.hnac.hzims.damsafety.vo.WrpSpgPztbVo; -import com.hnac.hzims.damsafety.wrapper.WrpSpgPztbWrapper; -import io.swagger.annotations.*; -import lombok.AllArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.springblade.common.cache.CacheNames; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/damSafety/wrpSpgPztb") -@AllArgsConstructor -@Api(value = "测压管测点", tags = "测压管测点接口") -public class WrpSpgPztbController extends BladeController implements CacheNames { - private final IWrpSpgPztbService wrpSpgPztbService; - - /** - * 分页 - */ - @GetMapping("/pageList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damcd", value = "断面编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "mpcd", value = "测点编号", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 1) - @ApiOperation(value = "分页", notes = "传入wrpSpgPztb") - public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { - LambdaQueryWrapper wrapper= ParamUtil.conditionWrpSpgPztb(param); - IPage pages = wrpSpgPztbService.page(Condition.getPage(query), wrapper); - return R.data(WrpSpgPztbWrapper.build().pageVO(pages)); - } - - /** - * 列表 - */ - @GetMapping("/list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damcd", value = "断面编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "mpcd", value = "测点编号", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 2) - @ApiOperation(value = "列表", notes = "传入wrpSpgPztb") - public R> list(@ApiIgnore @RequestParam Map param) { - LambdaQueryWrapper wrapper=ParamUtil.conditionWrpSpgPztb(param); - List list = wrpSpgPztbService.list(wrapper); - return R.data(WrpSpgPztbWrapper.build().listVO(list)); - } - - /** - * 查询测压管断面 - */ - @GetMapping("/section") - @ApiOperationSupport(order = 2) - @ApiOperation(value = "查询测压管断面") - public R>> section(HttpServletRequest request,String rscd) { - String deptId=request.getHeader("dept-id"); - if(StringUtils.isBlank(deptId)){ - deptId = AuthUtil.getDeptId(); - } - List> list = wrpSpgPztbService.section(deptId,rscd); - //返回断面加仪器数据 - return R.data(list,"查询断面成功"); - } - - - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 3) - @ApiOperation(value = "详情", notes = "传入wrpSpgPztb") - public R detail(WrpSpgPztb wrpSpgPztb) { - WrpSpgPztb detail = wrpSpgPztbService.getOne(Condition.getQueryWrapper(wrpSpgPztb)); - return R.data(WrpSpgPztbWrapper.build().entityVO(detail)); - } - - /** - * 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入wrpSpgPztb") - public R save(@RequestBody WrpSpgPztb wrpSpgPztb) { - LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); - wrapper.eq(WrpSpgPztb::getMpcd,wrpSpgPztb.getMpcd()); - List list = wrpSpgPztbService.list(wrapper); - if(list!=null && !list.isEmpty()) { - return R.data(500,false,"测点编号已存在"); - } - return R.status(wrpSpgPztbService.save(wrpSpgPztb)); - } - - /** - * 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入wrpSpgPztb") - public R update(@RequestBody WrpSpgPztb wrpSpgPztb) { - return R.status(wrpSpgPztbService.updateById(wrpSpgPztb)); - } - - /** - * 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "逻辑删除", notes = "ids") - public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { - boolean temp = wrpSpgPztbService.deleteLogic(Func.toLongList(ids)); - return R.status(temp); - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpSpgSpprmpController.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpSpgSpprmpController.java deleted file mode 100644 index cf1c276..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpSpgSpprmpController.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.hnac.hzims.damsafety.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzims.damsafety.entity.WrpSpgSpprmp; -import com.hnac.hzims.damsafety.service.IWrpSpgSpprmpService; -import com.hnac.hzims.damsafety.util.ParamUtil; -import com.hnac.hzims.damsafety.vo.WrpSpgSpprmpVo; -import com.hnac.hzims.damsafety.wrapper.WrpSpgSpprmpWrapper; -import io.swagger.annotations.*; -import lombok.AllArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.springblade.common.cache.CacheNames; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/damSafety/wrpSpgSpprmp") -@AllArgsConstructor -@Api(value = "渗流压力测点信息", tags = "渗流压力测点信息接口") -public class WrpSpgSpprmpController extends BladeController implements CacheNames { - private final IWrpSpgSpprmpService wrpSpgSpprmpService; - - /** - * 分页 - */ - @GetMapping("/pageList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damcd", value = "断面编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "mpcd", value = "测点编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "ch", value = "桩号", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 1) - @ApiOperation(value = "分页", notes = "传入wrpSpgSpprmp") - public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { - LambdaQueryWrapper wrapper= ParamUtil.conditionWrpSpgSpprmp(param); - IPage pages = wrpSpgSpprmpService.page(Condition.getPage(query), wrapper); - return R.data(WrpSpgSpprmpWrapper.build().pageVO(pages)); - } - - /** - * 列表 - */ - @GetMapping("/list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damcd", value = "断面编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "mpcd", value = "测点编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "ch", value = "桩号", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 2) - @ApiOperation(value = "列表", notes = "传入wrpSpgSpprmp") - public R> list(@ApiIgnore @RequestParam Map param) { - LambdaQueryWrapper wrapper=ParamUtil.conditionWrpSpgSpprmp(param); - List list = wrpSpgSpprmpService.list(wrapper); - return R.data(WrpSpgSpprmpWrapper.build().listVO(list)); - } - - - /** - * 查询渗压断面 - */ - @GetMapping("/section") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rscd", value = "水库编码", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 2) - @ApiOperation(value = "查询渗压断面") - public R>> section(HttpServletRequest request,String rscd) { - String deptId=request.getHeader("dept-id"); - if(StringUtils.isBlank(deptId)){ - deptId = AuthUtil.getDeptId(); - } - List> list = wrpSpgSpprmpService.section(deptId,rscd); - //返回断面加仪器数据 - return R.data(list,"查询断面成功"); - } - - - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 3) - @ApiOperation(value = "详情", notes = "传入wrpSpgSpprmp") - public R detail(WrpSpgSpprmp wrpSpgSpprmp) { - WrpSpgSpprmp detail = wrpSpgSpprmpService.getOne(Condition.getQueryWrapper(wrpSpgSpprmp)); - return R.data(WrpSpgSpprmpWrapper.build().entityVO(detail)); - } - - /** - * 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入wrpSpgSpprmp") - public R save(@RequestBody WrpSpgSpprmp wrpSpgSpprmp) { - LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); - wrapper.eq(WrpSpgSpprmp::getMpcd,wrpSpgSpprmp.getMpcd()); - List list = wrpSpgSpprmpService.list(wrapper); - if(list!=null && !list.isEmpty()) { - return R.data(500,false,"测点编号已存在"); - } - return R.status(wrpSpgSpprmpService.save(wrpSpgSpprmp)); - } - - /** - * 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入wrpSpgSpprmp") - public R update(@RequestBody WrpSpgSpprmp wrpSpgSpprmp) { - return R.status(wrpSpgSpprmpService.updateById(wrpSpgSpprmp)); - } - - /** - * 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "逻辑删除", notes = "ids") - public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { - boolean temp = wrpSpgSpprmpService.deleteLogic(Func.toLongList(ids)); - return R.status(temp); - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpSpgSpqnmpController.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpSpgSpqnmpController.java deleted file mode 100644 index 49bdb81..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/controller/WrpSpgSpqnmpController.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.hnac.hzims.damsafety.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzims.common.logs.annotation.OperationAnnotation; -import com.hnac.hzims.damsafety.entity.WrpSpgSpqnmp; -import com.hnac.hzims.damsafety.service.IWrpSpgSpqnmpService; -import com.hnac.hzims.damsafety.util.ParamUtil; -import com.hnac.hzims.damsafety.vo.WrpSpgSpqnmpVo; -import com.hnac.hzims.damsafety.wrapper.WrpSpgSpqnmpWrapper; -import io.swagger.annotations.*; -import lombok.AllArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.springblade.common.cache.CacheNames; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/damSafety/wrpSpgSpqnmp") -@AllArgsConstructor -@Api(value = "渗流量测点", tags = "渗流量测点接口") -public class WrpSpgSpqnmpController extends BladeController implements CacheNames { - private final IWrpSpgSpqnmpService wrpSpgSpqnmpService; - - /** - * 分页 - */ - @GetMapping("/pageList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damcd", value = "断面编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "mpcd", value = "测点编号", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 1) - @ApiOperation(value = "分页", notes = "传入wrpSpgSpqnmp") - public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { - LambdaQueryWrapper wrapper= ParamUtil.conditionWrpSpgSpqnmp(param); - IPage pages = wrpSpgSpqnmpService.page(Condition.getPage(query), wrapper); - return R.data(WrpSpgSpqnmpWrapper.build().pageVO(pages)); - } - - /** - * 列表 - */ - @GetMapping("/list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "damcd", value = "断面编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "mpcd", value = "测点编号", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 2) - @ApiOperation(value = "列表", notes = "传入wrpSpgSpqnmp") - public R> list(@ApiIgnore @RequestParam Map param) { - LambdaQueryWrapper wrapper=ParamUtil.conditionWrpSpgSpqnmp(param); - List list = wrpSpgSpqnmpService.list(wrapper); - return R.data(WrpSpgSpqnmpWrapper.build().listVO(list)); - } - - /** - * 查询渗流断面 - */ - @GetMapping("/section") - @ApiOperationSupport(order = 2) - @ApiOperation(value = "查询渗流断面") - public R>> section(HttpServletRequest request,String rscd) { - String deptId=request.getHeader("dept-id"); - if(StringUtils.isBlank(deptId)){ - deptId = AuthUtil.getDeptId(); - } - List> list = wrpSpgSpqnmpService.section(deptId,rscd); - //返回断面加仪器数据 - return R.data(list,"查询断面成功"); - } - - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 3) - @ApiOperation(value = "详情", notes = "传入wrpSpgSpqnmp") - public R detail(WrpSpgSpqnmp wrpSpgSpqnmp) { - WrpSpgSpqnmp detail = wrpSpgSpqnmpService.getOne(Condition.getQueryWrapper(wrpSpgSpqnmp)); - return R.data(WrpSpgSpqnmpWrapper.build().entityVO(detail)); - } - - /** - * 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入wrpSpgSpqnmp") - public R save(@RequestBody WrpSpgSpqnmp wrpSpgSpqnmp) { - LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); - wrapper.eq(WrpSpgSpqnmp::getMpcd,wrpSpgSpqnmp.getMpcd()); - List list = wrpSpgSpqnmpService.list(wrapper); - if(list!=null && !list.isEmpty()) { - return R.data(500,false,"测点编号已存在"); - } - return R.status(wrpSpgSpqnmpService.save(wrpSpgSpqnmp)); - } - - /** - * 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入wrpSpgSpqnmp") - public R update(@RequestBody WrpSpgSpqnmp wrpSpgSpqnmp) { - return R.status(wrpSpgSpqnmpService.updateById(wrpSpgSpqnmp)); - } - - /** - * 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "逻辑删除", notes = "ids") - public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { - boolean temp = wrpSpgSpqnmpService.deleteLogic(Func.toLongList(ids)); - return R.status(temp); - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/feign/WrpSectionBClient.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/feign/WrpSectionBClient.java deleted file mode 100644 index 4e1916a..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/feign/WrpSectionBClient.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hnac.hzims.damsafety.feign; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.hnac.hzims.damsafety.entity.WrpSectionB; -import com.hnac.hzims.damsafety.service.IDamSafetyDataService; -import com.hnac.hzims.damsafety.service.IWrpSectionBService; -import com.hnac.hzims.damsafety.util.ParamUtil; -import com.hnac.hzims.damsafety.vo.WrpSectionBVO; -import com.hnac.hzims.damsafety.wrapper.WrpSectionBWrapper; -import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; -import java.util.Map; - -@RestController -public class WrpSectionBClient implements IWrpSectionBClient { - - @Autowired - private IWrpSectionBService wrpSectionBService; - - @Autowired - private IDamSafetyDataService damSafetyDataService; - - @Override - public R> list(Map param) { - LambdaQueryWrapper wrapper= ParamUtil.conditionWrpSectionB(param); - List list = wrpSectionBService.list(wrapper); - return R.data(WrpSectionBWrapper.build().listVO(list)); - } - - @Override - public R> getRealData(String deviceCode) { - return R.data(damSafetyDataService.getRealData(deviceCode)); - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbBuildingMapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbBuildingMapper.java deleted file mode 100644 index 928538d..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbBuildingMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hnac.hzims.damsafety.mapper; - -import com.hnac.hzims.damsafety.entity.TBuilding; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; - -public interface TbBuildingMapper extends UserDataScopeBaseMapper { -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbBuildingMapper.xml b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbBuildingMapper.xml deleted file mode 100644 index 7f49d66..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbBuildingMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbProjInfoMapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbProjInfoMapper.java deleted file mode 100644 index d7b0e71..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbProjInfoMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hnac.hzims.damsafety.mapper; - -import com.hnac.hzims.damsafety.entity.TProjInfo; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; - -public interface TbProjInfoMapper extends UserDataScopeBaseMapper { -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbProjInfoMapper.xml b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbProjInfoMapper.xml deleted file mode 100644 index d861102..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbProjInfoMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbSectionConfigMapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbSectionConfigMapper.java deleted file mode 100644 index ccf23e5..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbSectionConfigMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hnac.hzims.damsafety.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzims.damsafety.entity.TSectionConfig; - -public interface TbSectionConfigMapper extends BaseMapper { -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbSectionConfigMapper.xml b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbSectionConfigMapper.xml deleted file mode 100644 index a15c7ef..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/TbSectionConfigMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDamsBMapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDamsBMapper.java deleted file mode 100644 index 6308444..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDamsBMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hnac.hzims.damsafety.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzims.damsafety.entity.WrpDamsB; - -public interface WrpDamsBMapper extends BaseMapper { -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDamsBMapper.xml b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDamsBMapper.xml deleted file mode 100644 index 63025e5..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDamsBMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrhrdsmpMapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrhrdsmpMapper.java deleted file mode 100644 index 8d7c93d..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrhrdsmpMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.damsafety.mapper; - -import com.hnac.hzims.damsafety.entity.WrpDfrSrhrdsmp; -import org.apache.ibatis.annotations.Param; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; - -import java.util.List; -import java.util.Map; - -public interface WrpDfrSrhrdsmpMapper extends UserDataScopeBaseMapper { - List> section(@Param("deptId") String deptId, @Param("rscd") String rscd); -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrhrdsmpMapper.xml b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrhrdsmpMapper.xml deleted file mode 100644 index d17bb5d..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrhrdsmpMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrvrdsbpMapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrvrdsbpMapper.java deleted file mode 100644 index 09d0ab8..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrvrdsbpMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hnac.hzims.damsafety.mapper; - -import com.hnac.hzims.damsafety.entity.WrpDfrSrvrdsbp; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; - -public interface WrpDfrSrvrdsbpMapper extends UserDataScopeBaseMapper { -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrvrdsbpMapper.xml b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrvrdsbpMapper.xml deleted file mode 100644 index b1ea19e..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrvrdsbpMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrvrdsmpMapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrvrdsmpMapper.java deleted file mode 100644 index 596aece..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrvrdsmpMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.damsafety.mapper; - -import com.hnac.hzims.damsafety.entity.WrpDfrSrvrdsmp; -import org.apache.ibatis.annotations.Param; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; - -import java.util.List; -import java.util.Map; - -public interface WrpDfrSrvrdsmpMapper extends UserDataScopeBaseMapper { - List> section(@Param("deptId") String deptId,@Param("rscd") String rscd); -} - diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrvrdsmpMapper.xml b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrvrdsmpMapper.xml deleted file mode 100644 index b2052bb..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpDfrSrvrdsmpMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSectionBMapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSectionBMapper.java deleted file mode 100644 index 2450a83..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSectionBMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright Example, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * Example, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.hnac.hzims.damsafety.mapper; - -import com.hnac.hzims.damsafety.entity.WrpSectionB; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; - -/** - * Mapper 接口 请不要使用TSectionMapper,否则扫描到的是TSectionMapper 而不是 tSectionMapper 导致找不到mapper - * @author Chill - */ -public interface WrpSectionBMapper extends UserDataScopeBaseMapper { -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSectionBMapper.xml b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSectionBMapper.xml deleted file mode 100644 index 418b268..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSectionBMapper.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgPztbMapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgPztbMapper.java deleted file mode 100644 index 7df95c5..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgPztbMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.damsafety.mapper; - -import com.hnac.hzims.damsafety.entity.WrpSpgPztb; -import org.apache.ibatis.annotations.Param; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; - -import java.util.List; -import java.util.Map; - -public interface WrpSpgPztbMapper extends UserDataScopeBaseMapper { - List> section(@Param("deptId") String deptId,@Param("rscd") String rscd); -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgPztbMapper.xml b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgPztbMapper.xml deleted file mode 100644 index 7fac0c9..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgPztbMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgSpprmpMapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgSpprmpMapper.java deleted file mode 100644 index fe0daf5..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgSpprmpMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.damsafety.mapper; - -import com.hnac.hzims.damsafety.entity.WrpSpgSpprmp; -import org.apache.ibatis.annotations.Param; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; - -import java.util.List; -import java.util.Map; - -public interface WrpSpgSpprmpMapper extends UserDataScopeBaseMapper { - List> section(@Param("deptId") String deptId,@Param("rscd") String rscd); -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgSpprmpMapper.xml b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgSpprmpMapper.xml deleted file mode 100644 index 2e82e78..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgSpprmpMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgSpqnmpMapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgSpqnmpMapper.java deleted file mode 100644 index 314cca4..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgSpqnmpMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.damsafety.mapper; - -import com.hnac.hzims.damsafety.entity.WrpSpgSpqnmp; -import org.apache.ibatis.annotations.Param; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; - -import java.util.List; -import java.util.Map; - -public interface WrpSpgSpqnmpMapper extends UserDataScopeBaseMapper { - List> section(@Param("deptId") String deptId,@Param("rscd") String rscd); -} - diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgSpqnmpMapper.xml b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgSpqnmpMapper.xml deleted file mode 100644 index cbbc403..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/mapper/WrpSpgSpqnmpMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IDamSafetyDataService.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IDamSafetyDataService.java deleted file mode 100644 index 908358f..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IDamSafetyDataService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hnac.hzims.damsafety.service; - -import com.hnac.hzims.entity.Report; -import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; -import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeInstanceFieldVO; -import com.hnac.hzinfo.sdk.analyse.vo.DeviceSinglePropsValueVO; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -public interface IDamSafetyDataService { - Report getReportData(List deviceCodes, String type, Integer accessRules, Date begin, Date end, String col); - List getSeepageLine(List deviceCodes, Date begin, Date end, String col); - Report getReportDataByDeviceCode(String deviceCode, String type, Integer accessRules, Date begin, Date end); - List getSignages(String stcd); - - Map getYearSpprReport(String rscd,List deviceCodes, Date begin, Date end,String col); - Map getYearHrdsReport(List deviceCodes,Date begin, Date end); - Report getYearVrdsReport(List deviceCodes,Date begin, Date end,String col); - - Map getDamReport(List deviceCodes,String type, Date begin, Date end,String col,int yearGap); - - List getRealData(String deviceCode); -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IFileUploadService.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IFileUploadService.java deleted file mode 100644 index a0f3fce..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IFileUploadService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.hnac.hzims.damsafety.service; - -import org.springframework.web.multipart.MultipartFile; - -import java.util.List; - -public interface IFileUploadService { - String addFile(MultipartFile file,String childPath); - List addFiles(MultipartFile[] files,String childPath); -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/ITBuildingService.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/ITBuildingService.java deleted file mode 100644 index 29bca9a..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/ITBuildingService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.hnac.hzims.damsafety.service; - -import com.hnac.hzims.damsafety.entity.TBuilding; -import org.springblade.core.mp.base.BaseService; - - -public interface ITBuildingService extends BaseService { -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/ITProjInfoService.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/ITProjInfoService.java deleted file mode 100644 index fee9de9..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/ITProjInfoService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hnac.hzims.damsafety.service; - -import com.hnac.hzims.damsafety.entity.TProjInfo; -import org.springblade.core.mp.base.BaseService; - -public interface ITProjInfoService extends BaseService { -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/ITSectionConfigService.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/ITSectionConfigService.java deleted file mode 100644 index 0465af0..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/ITSectionConfigService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hnac.hzims.damsafety.service; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.damsafety.entity.TSectionConfig; - -import java.util.List; - -public interface ITSectionConfigService{ - IPage page(IPage page, LambdaQueryWrapper wrapper); - - List list(LambdaQueryWrapper wrapper); - - TSectionConfig getOne(QueryWrapper wrapper); - - boolean save(TSectionConfig entity); - - boolean updateById(TSectionConfig entity); - - boolean delete(Wrapper wrapper); -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpDamsBService.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpDamsBService.java deleted file mode 100644 index 45d2919..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpDamsBService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hnac.hzims.damsafety.service; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.damsafety.entity.WrpDamsB; - -import java.util.List; - -public interface IWrpDamsBService { - IPage page(IPage page, LambdaQueryWrapper wrapper); - - List list(LambdaQueryWrapper wrapper); - - WrpDamsB getOne(QueryWrapper wrapper); - - boolean save(WrpDamsB entity); - - boolean updateById(WrpDamsB entity); - - boolean delete(Wrapper wrapper); -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpDfrSrhrdsmpService.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpDfrSrhrdsmpService.java deleted file mode 100644 index ee3cf37..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpDfrSrhrdsmpService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.damsafety.service; - -import com.hnac.hzims.damsafety.entity.WrpDfrSrhrdsmp; -import org.springblade.core.mp.base.BaseService; - -import java.util.List; -import java.util.Map; - -public interface IWrpDfrSrhrdsmpService extends BaseService { - List> section(String deptId,String rscd); - List> getSection(String deptId,String rscd); -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpDfrSrvrdsbpService.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpDfrSrvrdsbpService.java deleted file mode 100644 index 352b70d..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpDfrSrvrdsbpService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.hnac.hzims.damsafety.service; - -import com.hnac.hzims.damsafety.entity.WrpDfrSrvrdsbp; -import org.springblade.core.mp.base.BaseService; - -public interface IWrpDfrSrvrdsbpService extends BaseService { - -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpDfrSrvrdsmpService.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpDfrSrvrdsmpService.java deleted file mode 100644 index ed89845..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpDfrSrvrdsmpService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.damsafety.service; - -import com.hnac.hzims.damsafety.entity.WrpDfrSrvrdsmp; -import org.springblade.core.mp.base.BaseService; - -import java.util.List; -import java.util.Map; - -public interface IWrpDfrSrvrdsmpService extends BaseService { - List> section(String deptId,String rscd); - List> getSection(String deptId,String rscd); -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpSectionBService.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpSectionBService.java deleted file mode 100644 index 21ab3ab..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpSectionBService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright Example, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * Example, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.hnac.hzims.damsafety.service; - -import com.hnac.hzims.damsafety.entity.WrpSectionB; -import org.springblade.core.mp.base.BaseService; - -/** - * 服务类 - * - * @author Chill - */ -public interface IWrpSectionBService extends BaseService { -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpSpgPztbService.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpSpgPztbService.java deleted file mode 100644 index d30046d..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpSpgPztbService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.damsafety.service; - -import com.hnac.hzims.damsafety.entity.WrpSpgPztb; -import org.springblade.core.mp.base.BaseService; - -import java.util.List; -import java.util.Map; - -public interface IWrpSpgPztbService extends BaseService { - List> section(String deptId,String rscd); - List> getSection(String deptId,String rscd); -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpSpgSpprmpService.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpSpgSpprmpService.java deleted file mode 100644 index d70efea..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpSpgSpprmpService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.damsafety.service; - -import com.hnac.hzims.damsafety.entity.WrpSpgSpprmp; -import org.springblade.core.mp.base.BaseService; - -import java.util.List; -import java.util.Map; - -public interface IWrpSpgSpprmpService extends BaseService { - List> section(String deptId,String rscd); - List> getSection(String deptId,String rscd); -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpSpgSpqnmpService.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpSpgSpqnmpService.java deleted file mode 100644 index fa63027..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/IWrpSpgSpqnmpService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.damsafety.service; - -import com.hnac.hzims.damsafety.entity.WrpSpgSpqnmp; -import org.springblade.core.mp.base.BaseService; - -import java.util.List; -import java.util.Map; - -public interface IWrpSpgSpqnmpService extends BaseService { - List> section(String deptId,String rscd); - List> getSection(String deptId,String rscd); -} - diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/DamSafetyDataServiceImpl.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/DamSafetyDataServiceImpl.java deleted file mode 100644 index 584e6c0..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/DamSafetyDataServiceImpl.java +++ /dev/null @@ -1,647 +0,0 @@ -package com.hnac.hzims.damsafety.service.impl; - -import com.hnac.hzims.damsafety.service.IDamSafetyDataService; -import com.hnac.hzims.entity.Report; -import com.hnac.hzims.entity.ReportData; -import com.hnac.hzims.enums.QueryDateTypeEnum; -import com.hnac.hzims.util.CommonUtil; -import com.hnac.hzims.util.ReportDateUtil; -import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; -import com.hnac.hzinfo.datasearch.analyse.po.AnalyseCodeByAnalyseDataPO; -import com.hnac.hzinfo.datasearch.analyse.po.AnalyzeDataConditionPO; -import com.hnac.hzinfo.datasearch.analyse.vo.AnalyseDataTaosVO; -import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeDataConditionVO; -import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeInstanceFieldVO; -import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO; -import com.hnac.hzinfo.sdk.analyse.AnalyseDataSearchClient; -import com.hnac.hzinfo.sdk.analyse.po.ComputeBaseStrategyPO; -import com.hnac.hzinfo.sdk.analyse.vo.DeviceSinglePropsValueQuery; -import com.hnac.hzinfo.sdk.analyse.vo.DeviceSinglePropsValueVO; -import com.hnac.hzinfo.sdk.core.response.Result; -import com.hnac.hzinfo.sdk.real.RealDataSearchClient; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.*; - -@Service -@Slf4j -public class DamSafetyDataServiceImpl implements IDamSafetyDataService { - - @Autowired - AnalyseDataSearchClient analyseDataSearchClient; - - @Autowired - RealDataSearchClient realDataSearchClient; - - @Override - public Report getReportData(List deviceCodes, String type, Integer accessRules, Date begin, Date end, String col) { - //检查数据是否正常并转化 - final QueryDateTypeEnum dtEnum = CommonUtil.checkType(type); - if(deviceCodes==null || deviceCodes.size()<=0){ - return null; - } - - if(dtEnum ==null){ - return null; - } - - //初始化报表 - Report report = new Report(); - report.initBaseReport(deviceCodes.size(), begin, end, dtEnum); - //设置基础数据 - for (int i = 0; i < deviceCodes.size(); i++) { - String deviceCode = deviceCodes.get(i); - //获取数据库某个站点不同时间要求的数据 - List timeDataList = listDataReport(begin,end,dtEnum,deviceCode,accessRules,col); - - for (ReportData reportData : timeDataList) { - String value=reportData.getVal(); -// if(value!=null && !"-".equals(value) && !"".equals(value.trim())){ -// value = new BigDecimal(value).setScale(3,BigDecimal.ROUND_DOWN).toString(); -// } - if(value == null){ - value = "-"; - } - report.setBaseCell(reportData.getKeyStr(), i, value); - } - } - return report; - } - - @Override - public List getSeepageLine(List deviceCodes, Date begin, Date end, String col) { - return getEightHourData(deviceCodes,"0",begin,end,col); - } - - List getEightHourData(List deviceCodes, String accessRules,Date begin, Date end,String col){ - DeviceSinglePropsValueQuery query=new DeviceSinglePropsValueQuery(); - query.setDeviceCodes(deviceCodes); - query.setSignage(col); - query.setAccessRule(accessRules); - query.setBeginTime(begin); - query.setEndTime(end); - Result> result=analyseDataSearchClient.getValueOfBacthDeviceCode(query); - if(result==null || !result.isSuccess()){ - return null; - } - List list=result.getData(); - return list; - } - - @Override - public List getSignages(String stcd){ - //查询列 - Result> result=analyseDataSearchClient.getInstanceFieldByAnalyseCode(stcd,1,""); - if(result==null || !result.isSuccess()){ - return null; - } - - List analyzeInstanceFieldVOS=result.getData(); - return analyzeInstanceFieldVOS; - } - - @Override - public Map getYearSpprReport(String rscd,List deviceCodes, Date begin, Date end,String col) { - String type="day"; - Report report=getYearDataReport(deviceCodes,type,begin,end,col); - - //根据水库模型获取数据 - Report data=getMaxMinByDeviceCode(rscd,type,6,begin,end); - Map res=new HashMap<>(); - res.put("spprData",report); - res.put("reservoirData",data); - return res; - } - - @Override - public Map getYearHrdsReport(List deviceCodes, Date begin, Date end) { - Report xData=getYearDataReport(deviceCodes,"day",begin,end,"xhrds"); - Report yData=getYearDataReport(deviceCodes,"day",begin,end,"yhrds"); - Map res=new HashMap<>(); - res.put("xData",xData); - res.put("yData",yData); - return res; - } - - @Override - public Report getYearVrdsReport(List deviceCodes, Date begin, Date end, String col) { - return getYearDataReport(deviceCodes,"day",begin,end,col); - } - - @Override - public Map getDamReport(List deviceCodes,String type, Date begin, Date end, String col,int yearGap) { - Map res=new HashMap<>(); - Report report=getYearDataReport(deviceCodes,type,begin,end,col); - res.put("nowData",report); - //历史时间对应的历史数据 - Date historyDate=CommonUtil.getHistoryDate(begin,yearGap); - Report historyData=getHistoryData(deviceCodes,"year", historyDate, end, col); - res.put("historyData",historyData); - return res; - } - - @Override - public List getRealData(String stcd) { - RealDataSearchPO po=new RealDataSearchPO(); - po.setAnalyzeCode(stcd); - List list=getSignages(stcd); - if(list==null && list.isEmpty()){ - return null; - } - List signages=new ArrayList<>(); - for(AnalyzeInstanceFieldVO vo:list){ - signages.add(vo.getSignage()); - } - po.setSignages(signages); - Result> result=realDataSearchClient.getRealDataByDeviceCode(po); - return result.getData(); - } - - public Report getHistoryData(List deviceCodes,String type, Date begin, Date end, String col){ - //检查数据是否正常并转化 - final QueryDateTypeEnum dtEnum = CommonUtil.checkType(type); - if(deviceCodes==null || deviceCodes.size()<=0){ - return null; - } - int count=deviceCodes.size(); - //初始化报表 - Report report = new Report(); - report.initBaseReportHistory(count); - //设置基础数据 - for (int i = 0; i < count; i++) { - String deviceCode = deviceCodes.get(i); -// List dataList = listDataReport(param,dtEnum,deviceCode,1,col); -// dealMaxMin(report,i,dataList); - //获取数据库某个站点不同时间要求的数据 - List maxList = listDataReport(begin, end,dtEnum,deviceCode,1,col); - List minList = listDataReport(begin, end,dtEnum,deviceCode,2,col); - List avgList = listDataReport(begin, end,dtEnum,deviceCode,3,col); - dealHistoryMaxMin(report,i,maxList,minList,avgList); - } - return report; - } - - private void dealHistoryMaxMin(Report report ,int i,List maxList,List minList,List avgList){ - BigDecimal maxValue=null; - BigDecimal minValue=null; - BigDecimal avg=null; - if(maxList!=null && !maxList.isEmpty()){ - ReportData maxObj=maxList.get(0); - if(maxObj!=null && maxObj.getValue()!=null) { - maxValue = new BigDecimal(maxObj.getValue()).setScale(3, BigDecimal.ROUND_HALF_UP); - report.setBaseCell("maxDate", i, ReportDateUtil.getYMDStr(maxObj.getKeyDate())); - }else{ - report.setBaseCell("maxDate", i, "-"); - } - } - - if(minList!=null && !minList.isEmpty()){ - ReportData minObj=minList.get(0); - if(minObj!=null && minObj.getValue()!=null) { - minValue = new BigDecimal(minObj.getValue()).setScale(3, BigDecimal.ROUND_HALF_UP); - report.setBaseCell("minDate", i, ReportDateUtil.getYMDStr(minObj.getKeyDate())); - }else{ - report.setBaseCell("minDate", i, "-"); - } - } - - if(avgList!=null && !avgList.isEmpty()){ - ReportData avgObj=avgList.get(0); - if(avgObj!=null && avgObj.getValue()!=null) { - avg = new BigDecimal(avgObj.getValue()).setScale(3, BigDecimal.ROUND_HALF_UP); - } - } - if(maxValue!=null) { - report.setBaseCell("max", i, String.valueOf(maxValue)); - }else{ - report.setBaseCell("max", i, "-"); - } - - if(minValue!=null) { - report.setBaseCell("min", i, String.valueOf(minValue)); - }else{ - report.setBaseCell("min", i, "-"); - } - - if(avg!=null){ - report.setBaseCell("avg", i, String.valueOf(avg)); - }else{ - report.setBaseCell("avg", i, "-"); - } - - if(maxValue!=null && minValue!=null) { - BigDecimal range = maxValue.subtract(minValue); - BigDecimal tmpRang = range.setScale(3, BigDecimal.ROUND_HALF_UP); - report.setBaseCell("range", i, String.valueOf(tmpRang));//极差 - }else{ - report.setBaseCell("range", i, "-");//极差 - } - } - - private Report getYearDataReport(List deviceCodes,String type, Date begin, Date end, String col){ - //检查数据是否正常并转化 - final QueryDateTypeEnum dtEnum = CommonUtil.checkType(type); - if(deviceCodes==null || deviceCodes.size()<=0){ - return null; - } - - int count=deviceCodes.size(); - //初始化报表 - Report report = new Report(); - report.initBaseReportMaxMin(count, begin, end, dtEnum); - //设置基础数据 - for (int i = 0; i < count; i++) { - String deviceCode = deviceCodes.get(i); - //获取数据库某个站点不同时间要求的数据 - List timeDataList = listDataReport(begin, end,dtEnum,deviceCode,6,col); - - for (ReportData reportData : timeDataList) { - String value=reportData.getVal(); -// if(value!=null && !"-".equals(value) && !"".equals(value.trim())){ -// value = new BigDecimal(value).setScale(3,BigDecimal.ROUND_DOWN).toString(); -// } - if(value == null){ - value = "-"; - } - report.setBaseCell(reportData.getKeyStr(), i, value); - } - dealMaxMin(report,i,timeDataList); - } - return report; - } - -// private void dealMaxMin(Report report ,int i,List timeDataList){ -// if(timeDataList==null || timeDataList.isEmpty()){ -// return; -// } -// -// Optional max = timeDataList.stream().filter(reportData -> reportData.getValue()!=null).max(Comparator.comparingDouble(ReportData::getValue)); -// ReportData maxObj = max.get(); -// double maxValue=maxObj.getValue(); -// -// report.setBaseCell("max", i, String.valueOf(maxValue)); -// report.setBaseCell("maxDate", i, ReportDateUtil.getYMDStr(maxObj.getKeyDate())); -// -// Optional min = timeDataList.stream().filter(reportData -> reportData.getValue()!=null).min(Comparator.comparingDouble(ReportData::getValue)); -// ReportData minObj = min.get(); -// double minValue=minObj.getValue(); -// -// report.setBaseCell("min", i, String.valueOf(minValue)); -// report.setBaseCell("minDate", i, ReportDateUtil.getYMDStr(minObj.getKeyDate())); -// -// -// Double avgs = timeDataList.stream().filter(reportData -> reportData.getValue()!=null).mapToDouble(ReportData::getValue).average().orElse(0D); -// BigDecimal avg=new BigDecimal(String.valueOf(avgs)).setScale(3,BigDecimal.ROUND_HALF_UP); -// report.setBaseCell("avg", i, String.valueOf(avg)); -// -// BigDecimal range=new BigDecimal(maxValue).subtract(new BigDecimal(minValue)); -// BigDecimal tmpRang=range.setScale(3,BigDecimal.ROUND_HALF_UP); -// report.setBaseCell("range", i, String.valueOf(tmpRang.abs()));//极差 0或正值 -// -// } - - private void dealMaxMin(Report report ,int i,List timeDataList){ - if(timeDataList==null || timeDataList.isEmpty()){ - return; - } - - Optional max = timeDataList.stream().filter(reportData -> reportData.getValue()!=null).max(Comparator.comparingDouble(ReportData::getValue)); - - Double maxValue =0.0; - if(max!=null && max.isPresent()) { - ReportData maxObj = max.get(); - maxValue = maxObj.getValue(); - report.setBaseCell("max", i, String.valueOf(maxValue)); - report.setBaseCell("maxDate", i, ReportDateUtil.getYMDStr(maxObj.getKeyDate())); - }else{ - report.setBaseCell("max", i, "-"); - report.setBaseCell("maxDate", i, "-"); - } - - Optional min = timeDataList.stream().filter(reportData -> reportData.getValue()!=null).min(Comparator.comparingDouble(ReportData::getValue)); - - Double minValue=0.0; - if(min!=null && min.isPresent()) { - ReportData minObj = min.get(); - minValue = minObj.getValue(); - report.setBaseCell("min", i, String.valueOf(minValue)); - report.setBaseCell("minDate", i, ReportDateUtil.getYMDStr(minObj.getKeyDate())); - }else{ - report.setBaseCell("min", i, "-"); - report.setBaseCell("minDate", i, "-"); - } - - Double avgs = timeDataList.stream().filter(reportData -> reportData.getValue()!=null).mapToDouble(ReportData::getValue).average().orElse(0D); - BigDecimal avg=new BigDecimal(String.valueOf(avgs)).setScale(3,BigDecimal.ROUND_HALF_UP); - report.setBaseCell("avg", i, String.valueOf(avg)); - - BigDecimal range=new BigDecimal(maxValue).subtract(new BigDecimal(minValue)); - BigDecimal tmpRange=range.setScale(3,BigDecimal.ROUND_HALF_UP); - report.setBaseCell("range", i, String.valueOf(tmpRange));//极差 - - } - - -// public static void main(String[] args) { -// List dd=new ArrayList<>(); -// dd.add(null); -// dd.add(-18.924); -// dd.add(-444.924); -// -// Optional max = dd.stream().filter(aDouble -> aDouble!=null).max(Comparator.comparingDouble(Double::doubleValue)); -// Double maxObj = max.get(); -// System.out.println(maxObj); -// -// Optional min = dd.stream().filter(aDouble -> aDouble!=null).min(Comparator.comparingDouble(Double::doubleValue)); -// Double minObj = min.get(); -// System.out.println(minObj); -// -// Double avgs = dd.stream().filter(reportData -> reportData!=null).mapToDouble(Double::doubleValue).average().orElse(0D); -// BigDecimal avg=new BigDecimal(String.valueOf(avgs)).setScale(3,BigDecimal.ROUND_HALF_UP); -// -// System.out.println(avg); -// } - - - public Report getMaxMinByDeviceCode(String deviceCode, String type, Integer accessRules, Date start, Date end) { - //检查数据是否正常并转化 - final QueryDateTypeEnum dtEnum = CommonUtil.checkType(type); - if(deviceCode==null || "".equals(deviceCode)){ - return null; - } - - if(dtEnum ==null){ - return null; - } - - //设置基础数据 - List signages=getSignages(deviceCode); - if(signages==null || signages.isEmpty()){ - return null; - } - //初始化报表 - Report report = new Report(); - report.initBaseReportMaxMin(signages.size(), start, end, dtEnum); - - //获取数据库某个站点不同时间要求的数据 - List timeDataList = listDataReport(start, end,dtEnum,deviceCode,accessRules,signages); - for(int i=0;i tmpList=CommonUtil.getReportDataBySignage(timeDataList,signage); - - dealMaxMin(report,i,tmpList); - - for (ReportData reportData : tmpList) { - String value = reportData.getVal(); -// if (value != null && !"-".equals(value) && !"".equals(value.trim())) { -// value = new BigDecimal(value).setScale(3, BigDecimal.ROUND_DOWN).toString(); -// } - - if(value == null){ - value = "-"; - } - - report.setBaseCell(reportData.getKeyStr(), i, value); - } - } - - return report; - } - - @Override - public Report getReportDataByDeviceCode(String deviceCode, String type, Integer accessRules, Date start, Date end) { - //检查数据是否正常并转化 - final QueryDateTypeEnum dtEnum = CommonUtil.checkType(type); - if(deviceCode==null || "".equals(deviceCode)){ - return null; - } - - if(dtEnum ==null){ - return null; - } - - //设置基础数据 - List signages=getSignages(deviceCode); - if(signages==null || signages.isEmpty()){ - return null; - } - //初始化报表 - Report report = new Report(); -// List> titles=new ArrayList<>(); -// for(AnalyzeInstanceFieldVO vo:signages){ -// Map title=new HashMap<>(); -// title.put(vo.getSignage(),vo.getFieldName()); -// titles.add(title); -// } -// report.setTitle(titles); - report.initBaseReport(signages.size(), start, end, dtEnum); - - //获取数据库某个站点不同时间要求的数据 - List timeDataList = listDataReport(start, end,dtEnum,deviceCode,accessRules,signages); - for(int i=0;i tmpList=CommonUtil.getReportDataBySignage(timeDataList,signage); - for (ReportData reportData : tmpList) { - String value = reportData.getVal(); -// if (value != null && !"-".equals(value) && !"".equals(value.trim())) { -// value = new BigDecimal(value).setScale(3, BigDecimal.ROUND_DOWN).toString(); -// } - - if(value == null){ - value = "-"; - } - - report.setBaseCell(reportData.getKeyStr(), i, value); - } - } - - return report; - } - - //查询多个code对应的同一个值 - List getDataByDeviceCodes(List deviceCodes,Date begin,Date end,String accessRules,String col){ - DeviceSinglePropsValueQuery query=new DeviceSinglePropsValueQuery(); - query.setBeginTime(begin); - query.setEndTime(end); - query.setDeviceCodes(deviceCodes); - query.setSignage(col); - query.setAccessRule(accessRules); - Result> result=analyseDataSearchClient.getValueOfBacthDeviceCode(query); - List datas=result.getData(); - return datas; - } - - - private List listDataReport(Date begin,Date endSt, QueryDateTypeEnum dtEnum, String deviceCode, Integer accessRules, List signages) { - Integer saveTimeType=2; - if(QueryDateTypeEnum.DAY.equals(dtEnum)){ - saveTimeType = 3; - } - if(QueryDateTypeEnum.MONTH.equals(dtEnum)){ - saveTimeType = 5; - } - if(QueryDateTypeEnum.YEAR.equals(dtEnum)){ - saveTimeType = 6; - } - - LocalDateTime start = LocalDateTime.ofInstant(begin.toInstant(), ZoneId.systemDefault()); - LocalDateTime end = LocalDateTime.ofInstant(endSt.toInstant(), ZoneId.systemDefault()); - - return getDataByDeviceCode(deviceCode,accessRules,saveTimeType,start,end,signages); - } - - - private List listDataReport(Date begin,Date endSt,QueryDateTypeEnum dtEnum,String deviceCode,Integer accessRules,String col) { - - - Integer saveTimeType=2; - if(QueryDateTypeEnum.DAY.equals(dtEnum)){ - saveTimeType = 3; - } - if(QueryDateTypeEnum.MONTH.equals(dtEnum)){ - saveTimeType = 5; - } - if(QueryDateTypeEnum.YEAR.equals(dtEnum)){ - saveTimeType = 6; - } - - LocalDateTime start = LocalDateTime.ofInstant(begin.toInstant(), ZoneId.systemDefault()); - LocalDateTime end = LocalDateTime.ofInstant(endSt.toInstant(), ZoneId.systemDefault()); - //saveTimeType 周期类型: 0-> s(秒) 1->、m(分)、2->h(小时)3->、d(天)4->、w(周)5->、n(自然月)、6->y(自然年) - //accessRules 取数规则0=最早值、1=最大值、2=最小值、3=平均值、4=（累计值/和值)、5=（变化值/差值） 6=最新值 - return getDataByDeviceCode(deviceCode, accessRules, saveTimeType, start, end, col); - } - - List getDataByDeviceCode(String deviceCode,Integer accessRules,Integer saveTimeType, - LocalDateTime start,LocalDateTime end,List signages){ - List reportData=new ArrayList<>(); - AnalyseCodeByAnalyseDataPO po=new AnalyseCodeByAnalyseDataPO(); - po.setDeviceCode(deviceCode); - - List signboardConditions=new ArrayList<>(); - - for(AnalyzeInstanceFieldVO vo:signages) { - AnalyzeDataConditionPO conditionPO = new AnalyzeDataConditionPO(); - conditionPO.setBeginTime(start); - conditionPO.setEndTime(end); - conditionPO.setSignages(vo.getSignage()); -// conditionPO.setKeepFigures(3); - conditionPO.setAccessRules(accessRules); - conditionPO.setSaveTimeType(saveTimeType); - conditionPO.setTimeInterval(1); - conditionPO.setFull(1); - signboardConditions.add(conditionPO); - } - - po.setSignboardConditions(signboardConditions); - - Result> result=analyseDataSearchClient.getAnalyzeDataByAnalyzeCodeAndSignages(po); - if(result==null){ - return reportData; - } - List datas=result.getData(); - if(datas==null || datas.isEmpty()){ - return reportData; - } - for(AnalyzeDataConditionVO vo:datas){ - List dataTaosVOs=vo.getList(); - for(AnalyseDataTaosVO vv:dataTaosVOs) { - ReportData data=new ReportData(); - data.setKeyStr(CommonUtil.getKeyBySaveTimeType(vv.getTs(),saveTimeType)); - data.setKeyDate(vv.getTs()); - data.setStcd(vo.getSignage());//测站变成属性值 - data.setVal(vv.getVal()); - data.setName(vo.getName()); - reportData.add(data); - } - } - return reportData; - } - - List getDataByDeviceCode(String deviceCode,Integer accessRules,Integer saveTimeType, - LocalDateTime start,LocalDateTime end,String col){ - List reportData=new ArrayList<>(); - AnalyseCodeByAnalyseDataPO po=new AnalyseCodeByAnalyseDataPO(); - po.setDeviceCode(deviceCode); - - List signboardConditions=new ArrayList<>(); - AnalyzeDataConditionPO conditionPO=new AnalyzeDataConditionPO(); - conditionPO.setBeginTime(start); - conditionPO.setEndTime(end); - conditionPO.setSignages(col); -// conditionPO.setKeepFigures(3); - conditionPO.setAccessRules(accessRules); - conditionPO.setSaveTimeType(saveTimeType); - conditionPO.setTimeInterval(1); - conditionPO.setFull(1); - signboardConditions.add(conditionPO); - po.setSignboardConditions(signboardConditions); - Result> result=analyseDataSearchClient.getAnalyzeDataByAnalyzeCodeAndSignages(po); - if(result==null){ - return reportData; - } - List datas=result.getData(); - if(datas==null || datas.isEmpty()){ - return reportData; - } - for(AnalyzeDataConditionVO vo:datas){ - List dataTaosVOs=vo.getList(); - for (AnalyseDataTaosVO vv : dataTaosVOs) { - if(vo.getSignage().equals(col)) { - ReportData data = new ReportData(); - data.setKeyStr(CommonUtil.getKeyBySaveTimeType(vv.getTs(), saveTimeType)); - data.setKeyDate(vv.getTs()); - data.setStcd(deviceCode); - data.setVal(vv.getVal()); - data.setName(vo.getName()); - reportData.add(data); - } - } - } - return reportData; - } - - //按时间范围求最大值、最小值 - public List queryMaxOrMin(String deviceCode, Date startTime, Date endTime, - Integer calcType, String col) { - List res=new ArrayList<>(); - - List signages=new ArrayList<>(); - signages.add(col); - ComputeBaseStrategyPO po=new ComputeBaseStrategyPO(); - LocalDateTime start = LocalDateTime.ofInstant(startTime.toInstant(), ZoneId.systemDefault()); - po.setBeginTime(start); - LocalDateTime end = LocalDateTime.ofInstant(endTime.toInstant(), ZoneId.systemDefault()); - po.setEndTime(end); - po.setAccessRules(calcType); - po.setDeviceCode(deviceCode); - po.setSignages(signages); - Result> result=analyseDataSearchClient.getComputeBaseStrategy(po); - if(result==null){ - return res; - } - List datas =result.getData(); - - if(datas!=null && !datas.isEmpty()){ - for(AnalyseDataTaosVO vo:datas) { - if(col.equals(vo.getSignage())) { - ReportData reportData=new ReportData(); - String val=vo.getVal(); - String tm=vo.getTs(); - reportData.setKeyStr(tm); - reportData.setStcd(deviceCode); - reportData.setVal(val); - res.add(reportData); - } - } - } - - return res; - } - -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/FileUploadServiceImpl.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/FileUploadServiceImpl.java deleted file mode 100644 index b9a269d..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/FileUploadServiceImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hnac.hzims.damsafety.service.impl; - -import com.hnac.hzims.damsafety.service.IFileUploadService; -import org.apache.commons.io.FileUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -@Service -public class FileUploadServiceImpl implements IFileUploadService { - @Value("${file.upload.path}") - String fileUploadPath; - - @Override - public String addFile(MultipartFile file,String childPath) { - MultipartFile[] files=new MultipartFile[1]; - files[0] = file; - return addFiles(files,childPath).get(0); - } - - @Override - public List addFiles(MultipartFile[] files,String childPath){ - List list=new ArrayList<>(); - String dirName = UUID.randomUUID().toString().replace("-", ""); - File uploadPath = new File(fileUploadPath, childPath); - uploadPath = new File(uploadPath, dirName); - try { - if(!uploadPath.exists()){ - uploadPath.mkdirs(); - } - for(MultipartFile file:files){ - saveFile(file, uploadPath); - list.add(File.separator+childPath+File.separator+dirName+File.separator+file.getOriginalFilename()); - } - return list; - }catch (IOException e){ - return list; - } - } - - /** - * 保存文件,如果后期有要求需要处理重名情况 - * - * @param file 待保存的文件 - * @param uploadPath 上传的路径 - * @throws IOException - */ - private void saveFile(MultipartFile file, File uploadPath) throws IOException { - String originalName = file.getOriginalFilename(); - File path = new File(uploadPath, originalName); - if(!path.exists()){ - path.createNewFile(); - } - FileUtils.copyInputStreamToFile(file.getInputStream(), path); - } - -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/TBuildingServiceImpl.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/TBuildingServiceImpl.java deleted file mode 100644 index 104eddf..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/TBuildingServiceImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.damsafety.service.impl; - -import com.hnac.hzims.damsafety.entity.TBuilding; -import com.hnac.hzims.damsafety.mapper.TbBuildingMapper; -import com.hnac.hzims.damsafety.service.ITBuildingService; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -@Service -public class TBuildingServiceImpl extends BaseServiceImpl implements ITBuildingService { -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/TProjInfoServiceImpl.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/TProjInfoServiceImpl.java deleted file mode 100644 index 496cf8f..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/TProjInfoServiceImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.damsafety.service.impl; - -import com.hnac.hzims.damsafety.entity.TProjInfo; -import com.hnac.hzims.damsafety.mapper.TbProjInfoMapper; -import com.hnac.hzims.damsafety.service.ITProjInfoService; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -@Service -public class TProjInfoServiceImpl extends BaseServiceImpl implements ITProjInfoService { -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/TSectionConfigServiceImpl.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/TSectionConfigServiceImpl.java deleted file mode 100644 index 97e78ab..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/TSectionConfigServiceImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hnac.hzims.damsafety.service.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.damsafety.entity.TSectionConfig; -import com.hnac.hzims.damsafety.mapper.TbSectionConfigMapper; -import com.hnac.hzims.damsafety.service.ITSectionConfigService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; - -@Service -public class TSectionConfigServiceImpl implements ITSectionConfigService { - - @Resource - TbSectionConfigMapper tbSectionConfigMapper; - - @Override - public IPage page(IPage page, LambdaQueryWrapper wrapper) { - return tbSectionConfigMapper.selectPage(page,wrapper); - } - - @Override - public List list(LambdaQueryWrapper wrapper) { - return tbSectionConfigMapper.selectList(wrapper); - } - - @Override - public TSectionConfig getOne(QueryWrapper wrapper) { - return tbSectionConfigMapper.selectOne(wrapper); - } - - @Override - public boolean save(TSectionConfig entity) { - int count=tbSectionConfigMapper.insert(entity); - return count>0; - } - - @Override - public boolean updateById(TSectionConfig entity) { - int count=tbSectionConfigMapper.updateById(entity); - return count>0; - } - - @Override - public boolean delete(Wrapper wrapper) { - int count=tbSectionConfigMapper.delete(wrapper); - return count>0; - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpDamsBServiceImpl.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpDamsBServiceImpl.java deleted file mode 100644 index ad53a86..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpDamsBServiceImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.hnac.hzims.damsafety.service.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.damsafety.entity.WrpDamsB; -import com.hnac.hzims.damsafety.mapper.WrpDamsBMapper; -import com.hnac.hzims.damsafety.service.IWrpDamsBService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; - -@Service -public class WrpDamsBServiceImpl implements IWrpDamsBService { - - @Resource - WrpDamsBMapper wrpDamsBMapper; - - @Override - public IPage page(IPage page, LambdaQueryWrapper wrapper) { - return wrpDamsBMapper.selectPage(page,wrapper); - } - - @Override - public List list(LambdaQueryWrapper wrapper) { - return wrpDamsBMapper.selectList(wrapper); - } - - @Override - public WrpDamsB getOne(QueryWrapper wrapper) { - return wrpDamsBMapper.selectOne(wrapper); - } - - @Override - public boolean save(WrpDamsB entity) { - int count=wrpDamsBMapper.insert(entity); - return count>0; - } - - @Override - public boolean updateById(WrpDamsB entity) { - LambdaUpdateWrapper wrapper=new LambdaUpdateWrapper(); - wrapper.eq(WrpDamsB::getDamscd,entity.getDamscd()); - int count=wrpDamsBMapper.update(entity,wrapper); - return count>0; - } - - @Override - public boolean delete(Wrapper wrapper) { - int count=wrpDamsBMapper.delete(wrapper); - return count>0; - } - -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpDfrSrhrdsmpServiceImpl.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpDfrSrhrdsmpServiceImpl.java deleted file mode 100644 index a8b2529..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpDfrSrhrdsmpServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hnac.hzims.damsafety.service.impl; - -import com.hnac.hzims.damsafety.entity.WrpDfrSrhrdsmp; -import com.hnac.hzims.damsafety.mapper.WrpDfrSrhrdsmpMapper; -import com.hnac.hzims.damsafety.service.IWrpDfrSrhrdsmpService; -import com.hnac.hzims.damsafety.util.DealSectionUtil; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -@Service -public class WrpDfrSrhrdsmpServiceImpl extends BaseServiceImpl implements IWrpDfrSrhrdsmpService { - @Resource - WrpDfrSrhrdsmpMapper wrpDfrSrhrdsmpMapper; - - @Override - public List> section(String deptId,String rscd) { - List> list=wrpDfrSrhrdsmpMapper.section(deptId,rscd); - return DealSectionUtil.getSection(list); - } - - @Override - public List> getSection(String deptId,String rscd) { - List> list=wrpDfrSrhrdsmpMapper.section(deptId,rscd); - return list; - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpDfrSrvrdsbpServiceImpl.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpDfrSrvrdsbpServiceImpl.java deleted file mode 100644 index 15160cc..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpDfrSrvrdsbpServiceImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.damsafety.service.impl; - -import com.hnac.hzims.damsafety.entity.WrpDfrSrvrdsbp; -import com.hnac.hzims.damsafety.mapper.WrpDfrSrvrdsbpMapper; -import com.hnac.hzims.damsafety.service.IWrpDfrSrvrdsbpService; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -@Service -public class WrpDfrSrvrdsbpServiceImpl extends BaseServiceImpl implements IWrpDfrSrvrdsbpService { -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpDfrSrvrdsmpServiceImpl.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpDfrSrvrdsmpServiceImpl.java deleted file mode 100644 index 9907aa7..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpDfrSrvrdsmpServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hnac.hzims.damsafety.service.impl; - -import com.hnac.hzims.damsafety.entity.WrpDfrSrvrdsmp; -import com.hnac.hzims.damsafety.mapper.WrpDfrSrvrdsmpMapper; -import com.hnac.hzims.damsafety.service.IWrpDfrSrvrdsmpService; -import com.hnac.hzims.damsafety.util.DealSectionUtil; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -@Service -public class WrpDfrSrvrdsmpServiceImpl extends BaseServiceImpl implements IWrpDfrSrvrdsmpService { - @Resource - WrpDfrSrvrdsmpMapper wrpDfrSrvrdsmpMapper; - @Override - public List> section(String deptId,String rscd) { - List> list=wrpDfrSrvrdsmpMapper.section(deptId,rscd); - return DealSectionUtil.getSection(list); - } - - @Override - public List> getSection(String deptId, String rscd) { - return wrpDfrSrvrdsmpMapper.section(deptId,rscd); - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpSectionBServiceImpl.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpSectionBServiceImpl.java deleted file mode 100644 index 1d4b28b..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpSectionBServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright Example, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * Example, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.hnac.hzims.damsafety.service.impl; - -import com.hnac.hzims.damsafety.entity.WrpSectionB; -import com.hnac.hzims.damsafety.mapper.WrpSectionBMapper; -import com.hnac.hzims.damsafety.service.IWrpSectionBService; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * 服务实现类 - * @author Chill - */ -@Service -public class WrpSectionBServiceImpl extends BaseServiceImpl implements IWrpSectionBService { -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpSpgPztbServiceImpl.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpSpgPztbServiceImpl.java deleted file mode 100644 index 1eeca99..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpSpgPztbServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hnac.hzims.damsafety.service.impl; - -import com.hnac.hzims.damsafety.entity.WrpSpgPztb; -import com.hnac.hzims.damsafety.mapper.WrpSpgPztbMapper; -import com.hnac.hzims.damsafety.service.IWrpSpgPztbService; -import com.hnac.hzims.damsafety.util.DealSectionUtil; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -@Service -public class WrpSpgPztbServiceImpl extends BaseServiceImpl implements IWrpSpgPztbService { - - @Resource - WrpSpgPztbMapper wrpSpgPztbMapper; - - @Override - public List> section(String deptId,String rscd) { - List> list=wrpSpgPztbMapper.section(deptId,rscd); - return DealSectionUtil.getSection(list); - } - - @Override - public List> getSection(String deptId, String rscd) { - return wrpSpgPztbMapper.section(deptId,rscd); - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpSpgSpprmpServiceImpl.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpSpgSpprmpServiceImpl.java deleted file mode 100644 index c8c5a5e..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpSpgSpprmpServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hnac.hzims.damsafety.service.impl; - -import com.hnac.hzims.damsafety.entity.WrpSpgSpprmp; -import com.hnac.hzims.damsafety.mapper.WrpSpgSpprmpMapper; -import com.hnac.hzims.damsafety.service.IWrpSpgSpprmpService; -import com.hnac.hzims.damsafety.util.DealSectionUtil; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -@Service -public class WrpSpgSpprmpServiceImpl extends BaseServiceImpl implements IWrpSpgSpprmpService { - - @Resource - WrpSpgSpprmpMapper wrpSpgSpprmpMapper; - - @Override - public List> section(String deptId,String rscd) { - List> list=wrpSpgSpprmpMapper.section(deptId,rscd); - return DealSectionUtil.getSection(list); - } - - @Override - public List> getSection(String deptId, String rscd) { - return wrpSpgSpprmpMapper.section(deptId,rscd); - } - -} - diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpSpgSpqnmpServiceImpl.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpSpgSpqnmpServiceImpl.java deleted file mode 100644 index 2ee717f..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/WrpSpgSpqnmpServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hnac.hzims.damsafety.service.impl; - -import com.hnac.hzims.damsafety.entity.WrpSpgSpqnmp; -import com.hnac.hzims.damsafety.mapper.WrpSpgSpqnmpMapper; -import com.hnac.hzims.damsafety.service.IWrpSpgSpqnmpService; -import com.hnac.hzims.damsafety.util.DealSectionUtil; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -@Service -public class WrpSpgSpqnmpServiceImpl extends BaseServiceImpl implements IWrpSpgSpqnmpService { - @Resource - WrpSpgSpqnmpMapper wrpSpgSpqnmpMapper; - - @Override - public List> section(String deptId,String rscd) { - List> list=wrpSpgSpqnmpMapper.section(deptId,rscd); - return DealSectionUtil.getSection(list); - } - - @Override - public List> getSection(String deptId,String rscd) { - List> list=wrpSpgSpqnmpMapper.section(deptId,rscd); - return DealSectionUtil.getSection(list); - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/util/DealSectionUtil.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/util/DealSectionUtil.java deleted file mode 100644 index c6b9dbd..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/util/DealSectionUtil.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hnac.hzims.damsafety.util; - -import java.util.*; - -public class DealSectionUtil { - public static String getDeviceCode(List> data){ - StringBuilder sb=new StringBuilder(); - for(Map dd:data){ - String stcd=String.valueOf(dd.get("stcd")); - if("".equals(sb.toString())){ - sb.append(stcd); - }else{ - sb.append(","+stcd); - } - } - return sb.toString(); - } - - public static List> getSection(List> list){ - List> res=new ArrayList<>(); - Map>> map = new LinkedHashMap<>(); - for(Map ll:list) { - String damcd=String.valueOf(ll.get("damcd")); - List> tmpList=map.get(damcd); - if(tmpList!=null && !tmpList.isEmpty()) { - tmpList.add(ll); - map.put(damcd, tmpList); - }else{ - tmpList = new ArrayList<>(); - tmpList.add(ll); - map.put(damcd, tmpList); - } - } - - for (Map.Entry>> m : map.entrySet()) { - List> data= m.getValue(); - Map sj=new HashMap<>(); - sj.put("damnm",data.get(0).get("damnm")); - sj.put("rscd",data.get(0).get("rscd")); - sj.put("damcd",m.getKey()); - sj.put("deviceCode",getDeviceCode(data)); - res.add(sj); - } - - return res; - } - -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/util/ParamUtil.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/util/ParamUtil.java deleted file mode 100644 index ef37a3d..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/util/ParamUtil.java +++ /dev/null @@ -1,177 +0,0 @@ -package com.hnac.hzims.damsafety.util; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.hnac.hzims.damsafety.entity.*; - -import java.util.Map; - -public class ParamUtil { - public static LambdaQueryWrapper conditionWrpSectionB(Map param){ - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - if(param.get("rscd")!=null) { - wrapper.like(WrpSectionB::getRscd,param.get("rscd")); - } - if(param.get("buildingId")!=null) { - wrapper.eq(WrpSectionB::getBuildingId,param.get("buildingId")); - } - if(param.get("damcd")!=null) { - wrapper.like(WrpSectionB::getDamcd,param.get("damcd")); - } - - if(param.get("damnm")!=null) { - wrapper.like(WrpSectionB::getDamnm,param.get("damnm")); - } - - - if(param.get("wallType")!=null) { - wrapper.eq(WrpSectionB::getWallType,param.get("wallType")); - } - return wrapper; - } - - public static LambdaQueryWrapper conditionTBuilding(Map param){ - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - if(param.get("rscd")!=null) { - wrapper.like(TBuilding::getRscd,param.get("rscd")); - } - if(param.get("name")!=null) { - wrapper.like(TBuilding::getName,param.get("name")); - } - return wrapper; - } - - - public static LambdaQueryWrapper conditionTProjInfo(Map param){ - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - if(param.get("rscd")!=null) { - wrapper.like(TProjInfo::getRscd,param.get("rscd")); - } - if(param.get("projName")!=null) { - wrapper.like(TProjInfo::getProjName,param.get("projName")); - } - if(param.get("projCode")!=null) { - wrapper.like(TProjInfo::getProjCode,param.get("projCode")); - } - return wrapper; - } - - - public static LambdaQueryWrapper conditionTSectionConfig(Map param){ - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - if(param.get("stcd")!=null) { - wrapper.like(TSectionConfig::getStcd,param.get("stcd")); - } - if(param.get("sectionNo")!=null) { - wrapper.like(TSectionConfig::getSectionNo,param.get("sectionNo")); - } - return wrapper; - } - - public static LambdaQueryWrapper conditionWrpDamsB(Map param){ - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - if(param.get("damcd")!=null) { - wrapper.like(WrpDamsB::getDamcd,param.get("damcd")); - } - if(param.get("damscd")!=null) { - wrapper.like(WrpDamsB::getDamscd,param.get("damscd")); - } - if(param.get("damsnm")!=null) { - wrapper.like(WrpDamsB::getDamscd,param.get("damsnm")); - } - return wrapper; - } - - public static LambdaQueryWrapper conditionWrpDfrSrhrdsmp(Map param){ - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - if(param.get("damcd")!=null) { - wrapper.like(WrpDfrSrhrdsmp::getDamcd,param.get("damcd")); - } - if(param.get("stcd")!=null) { - wrapper.like(WrpDfrSrhrdsmp::getStcd,param.get("stcd")); - } - if(param.get("mpcd")!=null) { - wrapper.like(WrpDfrSrhrdsmp::getMpcd,param.get("mpcd")); - } - return wrapper; - } - - public static LambdaQueryWrapper conditionWrpDfrSrvrdsbp(Map param){ - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - if(param.get("rscd")!=null) { - wrapper.like(WrpDfrSrvrdsbp::getRscd,param.get("rscd")); - } - if(param.get("hycncd")!=null) { - wrapper.eq(WrpDfrSrvrdsbp::getHycncd,param.get("hycncd")); - } - if(param.get("bpcd")!=null) { - wrapper.like(WrpDfrSrvrdsbp::getBpcd,param.get("bpcd")); - } - if(param.get("bptp")!=null) { - wrapper.like(WrpDfrSrvrdsbp::getBptp,param.get("bptp")); - } - return wrapper; - } - - - public static LambdaQueryWrapper conditionWrpDfrSrvrdsmp(Map param){ - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - if(param.get("damcd")!=null) { - wrapper.like(WrpDfrSrvrdsmp::getDamcd,param.get("damcd")); - } - if(param.get("stcd")!=null) { - wrapper.like(WrpDfrSrvrdsmp::getStcd,param.get("stcd")); - } - if(param.get("mpcd")!=null) { - wrapper.like(WrpDfrSrvrdsmp::getMpcd,param.get("mpcd")); - } - return wrapper; - } - - public static LambdaQueryWrapper conditionWrpSpgPztb(Map param){ - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - if(param.get("damcd")!=null) { - wrapper.like(WrpSpgPztb::getDamcd,param.get("damcd")); - } - if(param.get("stcd")!=null) { - wrapper.like(WrpSpgPztb::getStcd,param.get("stcd")); - } - if(param.get("mpcd")!=null) { - wrapper.like(WrpSpgPztb::getMpcd,param.get("mpcd")); - } - return wrapper; - } - - public static LambdaQueryWrapper conditionWrpSpgSpprmp(Map param){ - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - if(param.get("damcd")!=null) { - wrapper.like(WrpSpgSpprmp::getDamcd,param.get("damcd")); - } - if(param.get("stcd")!=null) { - wrapper.like(WrpSpgSpprmp::getStcd,param.get("stcd")); - } - if(param.get("mpcd")!=null) { - wrapper.like(WrpSpgSpprmp::getMpcd,param.get("mpcd")); - } - if(param.get("ch")!=null) { - wrapper.like(WrpSpgSpprmp::getCh,param.get("ch")); - } - return wrapper; - } - - - public static LambdaQueryWrapper conditionWrpSpgSpqnmp(Map param){ - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - if(param.get("damcd")!=null) { - wrapper.like(WrpSpgSpqnmp::getDamcd,param.get("damcd")); - } - if(param.get("stcd")!=null) { - wrapper.like(WrpSpgSpqnmp::getStcd,param.get("stcd")); - } - if(param.get("mpcd")!=null) { - wrapper.like(WrpSpgSpqnmp::getMpcd,param.get("mpcd")); - } - return wrapper; - } - - -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/TBuildingWrapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/TBuildingWrapper.java deleted file mode 100644 index fa206c6..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/TBuildingWrapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hnac.hzims.damsafety.wrapper; - -import com.hnac.hzims.damsafety.entity.TBuilding; -import com.hnac.hzims.damsafety.vo.TBuildingVo; -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; - - -import java.util.Objects; - -public class TBuildingWrapper extends BaseEntityWrapper { - public TBuildingWrapper() { - } - - public static TBuildingWrapper build() { - return new TBuildingWrapper(); - } - - @Override - public TBuildingVo entityVO(TBuilding entity) { - TBuildingVo tBuildingVo = Objects.requireNonNull(BeanUtil.copy(entity, TBuildingVo.class)); - return tBuildingVo; - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/TProjInfoWrapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/TProjInfoWrapper.java deleted file mode 100644 index 42e50c8..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/TProjInfoWrapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hnac.hzims.damsafety.wrapper; - -import com.hnac.hzims.damsafety.entity.TProjInfo; -import com.hnac.hzims.damsafety.vo.TProjInfoVo; -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; - -import java.util.Objects; - -public class TProjInfoWrapper extends BaseEntityWrapper { - public TProjInfoWrapper() { - } - - public static TProjInfoWrapper build() { - return new TProjInfoWrapper(); - } - - @Override - public TProjInfoVo entityVO(TProjInfo entity) { - if(entity == null){ - return null; - } - TProjInfoVo tProjInfoVo = Objects.requireNonNull(BeanUtil.copy(entity, TProjInfoVo.class)); - return tProjInfoVo; - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpDfrSrhrdsmpWrapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpDfrSrhrdsmpWrapper.java deleted file mode 100644 index d506247..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpDfrSrhrdsmpWrapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hnac.hzims.damsafety.wrapper; - -import com.hnac.hzims.damsafety.entity.WrpDfrSrhrdsmp; -import com.hnac.hzims.damsafety.vo.WrpDfrSrhrdsmpVo; -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; - -import java.util.Objects; - -public class WrpDfrSrhrdsmpWrapper extends BaseEntityWrapper { - public WrpDfrSrhrdsmpWrapper() { - } - - public static WrpDfrSrhrdsmpWrapper build() { - return new WrpDfrSrhrdsmpWrapper(); - } - - @Override - public WrpDfrSrhrdsmpVo entityVO(WrpDfrSrhrdsmp entity) { - if(entity == null){ - return null; - } - WrpDfrSrhrdsmpVo wrpDfrSrhrdsmpVo = Objects.requireNonNull(BeanUtil.copy(entity, WrpDfrSrhrdsmpVo.class)); - - return wrpDfrSrhrdsmpVo; - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpDfrSrvrdsbpWrapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpDfrSrvrdsbpWrapper.java deleted file mode 100644 index b1f5417..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpDfrSrvrdsbpWrapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hnac.hzims.damsafety.wrapper; - -import com.hnac.hzims.damsafety.entity.WrpDfrSrvrdsbp; -import com.hnac.hzims.damsafety.vo.WrpDfrSrvrdsbpVo; -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; - -import java.util.Objects; - -public class WrpDfrSrvrdsbpWrapper extends BaseEntityWrapper { - public WrpDfrSrvrdsbpWrapper() { - } - - public static WrpDfrSrvrdsbpWrapper build() { - return new WrpDfrSrvrdsbpWrapper(); - } - - @Override - public WrpDfrSrvrdsbpVo entityVO(WrpDfrSrvrdsbp entity) { - if(entity == null){ - return null; - } - WrpDfrSrvrdsbpVo wrpDfrSrvrdsbpVo = Objects.requireNonNull(BeanUtil.copy(entity, WrpDfrSrvrdsbpVo.class)); - - return wrpDfrSrvrdsbpVo; - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpDfrSrvrdsmpWrapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpDfrSrvrdsmpWrapper.java deleted file mode 100644 index 5e47e27..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpDfrSrvrdsmpWrapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hnac.hzims.damsafety.wrapper; - -import com.hnac.hzims.damsafety.entity.WrpDfrSrvrdsmp; -import com.hnac.hzims.damsafety.vo.WrpDfrSrvrdsmpVo; -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; - -import java.util.Objects; - -public class WrpDfrSrvrdsmpWrapper extends BaseEntityWrapper { - public WrpDfrSrvrdsmpWrapper() { - } - - public static WrpDfrSrvrdsmpWrapper build() { - return new WrpDfrSrvrdsmpWrapper(); - } - - @Override - public WrpDfrSrvrdsmpVo entityVO(WrpDfrSrvrdsmp entity) { - if(entity == null){ - return null; - } - WrpDfrSrvrdsmpVo wrpDfrSrvrdsmpVo = Objects.requireNonNull(BeanUtil.copy(entity, WrpDfrSrvrdsmpVo.class)); - - return wrpDfrSrvrdsmpVo; - } -} \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpSectionBWrapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpSectionBWrapper.java deleted file mode 100644 index 77cabaa..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpSectionBWrapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hnac.hzims.damsafety.wrapper; - -import com.hnac.hzims.damsafety.entity.WrpSectionB; -import com.hnac.hzims.damsafety.vo.WrpSectionBVO; -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; - -import java.util.Objects; - -public class WrpSectionBWrapper extends BaseEntityWrapper { - public WrpSectionBWrapper() { - } - - public static WrpSectionBWrapper build() { - return new WrpSectionBWrapper(); - } - - @Override - public WrpSectionBVO entityVO(WrpSectionB entity) { - if(entity == null){ - return null; - } - WrpSectionBVO wrpSectionBVO = Objects.requireNonNull(BeanUtil.copy(entity, WrpSectionBVO.class)); - //测点集合 - wrpSectionBVO.setPoints(null); - return wrpSectionBVO; - } -} diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpSpgPztbWrapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpSpgPztbWrapper.java deleted file mode 100644 index 91e13ea..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpSpgPztbWrapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hnac.hzims.damsafety.wrapper; - -import com.hnac.hzims.damsafety.entity.WrpSpgPztb; -import com.hnac.hzims.damsafety.vo.WrpSpgPztbVo; -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; - -import java.util.Objects; - -public class WrpSpgPztbWrapper extends BaseEntityWrapper { - public WrpSpgPztbWrapper() { - } - - public static WrpSpgPztbWrapper build() { - return new WrpSpgPztbWrapper(); - } - - @Override - public WrpSpgPztbVo entityVO(WrpSpgPztb entity) { - if(entity == null){ - return null; - } - WrpSpgPztbVo wrpSpgPztbVo = Objects.requireNonNull(BeanUtil.copy(entity, WrpSpgPztbVo.class)); - - return wrpSpgPztbVo; - } -} \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpSpgSpprmpWrapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpSpgSpprmpWrapper.java deleted file mode 100644 index f34f6f8..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpSpgSpprmpWrapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hnac.hzims.damsafety.wrapper; - -import com.hnac.hzims.damsafety.entity.WrpSpgSpprmp; -import com.hnac.hzims.damsafety.vo.WrpSpgSpprmpVo; -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; - -import java.util.Objects; - -public class WrpSpgSpprmpWrapper extends BaseEntityWrapper { - public WrpSpgSpprmpWrapper() { - } - - public static WrpSpgSpprmpWrapper build() { - return new WrpSpgSpprmpWrapper(); - } - - @Override - public WrpSpgSpprmpVo entityVO(WrpSpgSpprmp entity) { - if(entity == null){ - return null; - } - WrpSpgSpprmpVo wrpSpgSpprmpVo = Objects.requireNonNull(BeanUtil.copy(entity, WrpSpgSpprmpVo.class)); - - return wrpSpgSpprmpVo; - } -} \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpSpgSpqnmpWrapper.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpSpgSpqnmpWrapper.java deleted file mode 100644 index bbac35c..0000000 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/wrapper/WrpSpgSpqnmpWrapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hnac.hzims.damsafety.wrapper; - -import com.hnac.hzims.damsafety.entity.WrpSpgSpqnmp; -import com.hnac.hzims.damsafety.vo.WrpSpgSpqnmpVo; -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; - -import java.util.Objects; - -public class WrpSpgSpqnmpWrapper extends BaseEntityWrapper { - public WrpSpgSpqnmpWrapper() { - } - - public static WrpSpgSpqnmpWrapper build() { - return new WrpSpgSpqnmpWrapper(); - } - - @Override - public WrpSpgSpqnmpVo entityVO(WrpSpgSpqnmp entity) { - if(entity == null){ - return null; - } - WrpSpgSpqnmpVo wrpSpgSpqnmpVo = Objects.requireNonNull(BeanUtil.copy(entity, WrpSpgSpqnmpVo.class)); - - return wrpSpgSpqnmpVo; - } -} \ No newline at end of file diff --git a/hzims-service/dam-safety/src/main/resources/application-dev.yml b/hzims-service/dam-safety/src/main/resources/application-dev.yml deleted file mode 100644 index 50a4ea7..0000000 --- a/hzims-service/dam-safety/src/main/resources/application-dev.yml +++ /dev/null @@ -1,30 +0,0 @@ -#服务器端口 -server: - port: 8200 - -#数据源配置 -#spring: -# datasource: -# url: ${blade.datasource.dev.url} -# username: ${blade.datasource.dev.username} -# password: ${blade.datasource.dev.password} - -spring: - #排除DruidDataSourceAutoConfigure - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - datasource: - dynamic: - #设置默认的数据源或者数据源组,默认值即为master - primary: master - datasource: - master: - url: jdbc:mysql://127.0.0.1:3306/equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true - username: root - password: 123456 - slave: - url: jdbc:mysql://127.0.0.1:3306/equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true - username: root - password: 123456 -demo: - name: aaa diff --git a/hzims-service/dam-safety/src/main/resources/application-prod.yml b/hzims-service/dam-safety/src/main/resources/application-prod.yml deleted file mode 100644 index da89262..0000000 --- a/hzims-service/dam-safety/src/main/resources/application-prod.yml +++ /dev/null @@ -1,28 +0,0 @@ -#服务器端口 -server: - port: 8200 - -#数据源配置 -#spring: -# datasource: -# url: ${blade.datasource.prod.url} -# username: ${blade.datasource.prod.username} -# password: ${blade.datasource.prod.password} - -spring: - #排除DruidDataSourceAutoConfigure - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - datasource: - dynamic: - #设置默认的数据源或者数据源组,默认值即为master - primary: master - datasource: - master: - url: ${blade.datasource.demo.master.url} - username: ${blade.datasource.demo.master.username} - password: ${blade.datasource.demo.master.password} - slave: - url: ${blade.datasource.demo.slave.url} - username: ${blade.datasource.demo.slave.username} - password: ${blade.datasource.demo.slave.password} diff --git a/hzims-service/dam-safety/src/main/resources/application.yml b/hzims-service/dam-safety/src/main/resources/application.yml deleted file mode 100644 index 0952a13..0000000 --- a/hzims-service/dam-safety/src/main/resources/application.yml +++ /dev/null @@ -1,13 +0,0 @@ -#mybatis-plus配置 -mybatis-plus: - mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml - #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.hnac.hzims.**.entity - -#swagger扫描路径配置 -swagger: - base-packages: - - org.springbalde - - com.hnac - - diff --git a/hzims-service/digital-twin-display/pom.xml b/hzims-service/digital-twin-display/pom.xml deleted file mode 100644 index af85fc2..0000000 --- a/hzims-service/digital-twin-display/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - 4.0.0 - - com.hnac.hzims - hzims-service - 4.0.0-SNAPSHOT - - - digital-twin-display - jar - ${hzims.project.version} - - - 8 - 8 - UTF-8 - - - - - - - org.springblade - blade-core-boot - - - org.springblade - blade-starter-swagger - - - org.springblade - blade-starter-oss-all - - - com.baomidou - dynamic-datasource-spring-boot-starter - - - org.springblade - blade-core-test - test - - - org.springblade - blade-core-auto - compile - - - - - com.hnac.hzims - digital-twin-display-api - ${hzims.project.version} - - - - com.hnac.hzinfo.data - hzinfo-data-sdk - - - - com.hnac.hzims - weather-api - ${hzims.project.version} - - - - com.hnac.hzims - dam-safety-api - ${hzims.project.version} - - - - com.hnac.hzims - inspect-api - - - - com.hnac.hzims - hzims-operational-api - - - \ No newline at end of file diff --git a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/DigitalTwinDisplayApplication.java b/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/DigitalTwinDisplayApplication.java deleted file mode 100644 index ad3bcd6..0000000 --- a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/DigitalTwinDisplayApplication.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hnac.hzims.twindisplay; - -import org.mybatis.spring.annotation.MapperScan; -import org.springblade.core.cloud.feign.EnableBladeFeign; -import org.springblade.core.launch.BladeApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.cloud.client.SpringCloudApplication; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.scheduling.annotation.EnableScheduling; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/25 8:24 - */ -//数据孪生展示服务 -@EnableBladeFeign(basePackages = {"org.springblade","com.hnac"}) -@SpringCloudApplication -@MapperScan("com.hnac.hzims.**.mapper.**") -@EnableScheduling -@ComponentScan(basePackages = {"com.hnac.hzims.*"}) -public class DigitalTwinDisplayApplication extends SpringBootServletInitializer { - public final static String APP_NAME = "digital-twin-display"; - - static { - System.setProperty("spring.cloud.nacos.discovery.server-addr", "http://hadoop:8848"); - System.setProperty("spring.cloud.nacos.config.server-addr", "http://hadoop:8848"); - System.setProperty("spring.cloud.nacos.username", "nacos"); - System.setProperty("spring.cloud.nacos.password", "nacos"); - } - - - public static void main(String[] args) { -// System.setProperty("nacos.standalone", "true"); - BladeApplication.run(APP_NAME, DigitalTwinDisplayApplication.class, args); - } - - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - return BladeApplication.createSpringApplicationBuilder(builder, APP_NAME, DigitalTwinDisplayApplication.class); - } -} \ No newline at end of file diff --git a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/controller/BaseInfoController.java b/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/controller/BaseInfoController.java deleted file mode 100644 index e5893f6..0000000 --- a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/controller/BaseInfoController.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.hnac.hzims.twindisplay.controller; - -import com.hnac.hzims.hzimsweather.vo.RainFallCountByMonthVo; -import com.hnac.hzims.twindisplay.service.IDigitalBaseInfoService; -import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@RestController -@Api(description = "数字孪生水电站一张图系统基本信息控制器") -@RequestMapping(value = "/digital/baseInfo/") -public class BaseInfoController { - - @Autowired - private IDigitalBaseInfoService digitalBaseInfoService; - - @ApiOperation(notes = "获取当前日期信息", value = "获取当前日期信息") - @RequestMapping(value = "/getDateInfo", method = RequestMethod.GET) - @ResponseBody - public Map getDateInfo(String areaCode) { - return digitalBaseInfoService.getDateInfo(); - } - - @ApiOperation(notes = "获取气象信息", value = "获取气象信息") - @RequestMapping(value = "/getWeatherInfo", method = RequestMethod.GET) - @ResponseBody - public Map getWeatherInfo(String location) { - Map result = new HashMap<>(1); - result.put(location, digitalBaseInfoService.getWeatherInfo(location)); - return result; - } - - @ApiOperation(notes = "获取水位信息", value = "获取水位信息") - @RequestMapping(value = "/getWaterLevel", method = RequestMethod.GET) - @ResponseBody - public double getWaterLevel(String instanceCode, String signage) { - return digitalBaseInfoService.getWaterLevel(instanceCode, signage); - } - - @ApiOperation(notes = "获取设备实时信息接口", value = "获取设备实时信息接口") - @RequestMapping(value = "/getRealData", method = RequestMethod.GET) - public Map getRealData(String deviceCode){ - Map result = new HashMap<>(); - List data = digitalBaseInfoService.getRealData(deviceCode); - result.put(deviceCode, data); - return result; - } - - @ApiOperation(notes = "获取降雨量信息", value = "获取降雨量信息") - @RequestMapping(value = "/getRainFallInfo", method = RequestMethod.GET) - @ResponseBody - public Map> getRainFallInfo(String year,String location) { - return digitalBaseInfoService.getRainFallInfo(year,location); - } - - @ApiOperation(notes = "获取电站发电运行信息", value = "获取电站发电运行信息") - @RequestMapping(value = "/getPowerStationHisInfo", method = RequestMethod.GET) - public Map getPowerStationHisInfo(String deviceCode){ - //有功功率属性名 - String activePower = "activePower"; - //无功功率属性名 - String reactivePower = "reactivePower"; - //发电量 - String power = "power"; - Map data = digitalBaseInfoService.getPowerStationHisInfo(deviceCode,activePower,reactivePower,power); - - return data; - } -} diff --git a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/controller/RouteController.java b/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/controller/RouteController.java deleted file mode 100644 index 0e05da3..0000000 --- a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/controller/RouteController.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.hnac.hzims.twindisplay.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzims.twindisplay.service.RouteService; -import com.hnac.hzinfo.inspect.plan.entity.RouteEntity; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.support.BladePage; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import java.util.Map; - -/** - * 三维巡检 - * - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/25 9:24 - */ -@Slf4j -@RestController -@RequestMapping("/route") -public class RouteController { - - - @Autowired - private RouteService routeService; - - - /** - * 查询巡检路径管理列表 - * - * @param st_re_route - * @param query - * @return - */ - @GetMapping("/list") - public R listRoute(@ApiIgnore @RequestParam Map st_re_route, Query query) { - BladePage pages = routeService.listRoute(st_re_route, query); - return R.data(pages); - - } - - - /** - * 新增 代码自定义代号 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入st_re_route") - public R save(@RequestBody RouteEntity st_re_route) { - routeService.save(st_re_route); - return R.success("保存成功"); - } - - - /** - * 修改 代码自定义代号 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入st_re_route") - public R update(@RequestBody RouteEntity st_re_route) { - routeService.update(st_re_route); - return R.success("修改成功"); - } - - - /** - * 删除 代码自定义代号 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 7) - @ApiOperation(value = "逻辑删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - routeService.remove(ids); - return R.success("删除成功"); - } - - -} diff --git a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/controller/StatisticsController.java b/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/controller/StatisticsController.java deleted file mode 100644 index 4023b80..0000000 --- a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/controller/StatisticsController.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.hnac.hzims.twindisplay.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.common.logs.annotation.OperationAnnotation; -import com.hnac.hzims.common.logs.enums.BusinessType; -import com.hnac.hzims.common.logs.enums.OperatorType; - -import com.hnac.hzims.operational.defect.vo.OperDefectStatisticsVO; -import com.hnac.hzims.operational.defect.vo.StatistictCountVo; -import com.hnac.hzims.twindisplay.service.StatisticsService; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springblade.core.mp.support.BladePage; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.openfeign.SpringQueryMap; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/25 15:27 - */ -@RestController -@AllArgsConstructor -@RequestMapping("/defect_statistic") -public class StatisticsController { - - - @Autowired - private StatisticsService statisticsService; - - - - @GetMapping("/list") - @ApiOperation(value = "分页", notes = "传入statistics") - @ApiImplicitParams({ - }) - @OperationAnnotation(moduleName = "缺陷管理",title = "缺陷记录",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action - = "分页查询缺陷记录列表") - public R> list(@SpringQueryMap OperDefectStatisticsVO entity){ - - BladePage resultPage = statisticsService.list(entity); - return R.data(resultPage); - - } - - - - /** - * 巡检任务统计 - * @return - */ - @GetMapping("/defectStatistictCount") - public R defectStatistictCount(){ - - List statistictCountVos = statisticsService.defectStatistictCount(); - return R.data(statistictCountVos); - } -} diff --git a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/controller/TaskController.java b/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/controller/TaskController.java deleted file mode 100644 index 81c4dde..0000000 --- a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/controller/TaskController.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.hnac.hzims.twindisplay.controller; - -import com.hnac.hzims.twindisplay.service.TaskService; -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 lombok.extern.slf4j.Slf4j; -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.beans.factory.annotation.Autowired; -import org.springframework.cloud.openfeign.SpringQueryMap; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/25 13:45 - */ -@Slf4j -@RestController -@RequestMapping("/task") -public class TaskController { - - - @Autowired - private TaskService taskService; - - - /** - * 巡检任务分页 - */ - @GetMapping("/pageList/{page}/{size}") - @ApiOperation(value = "分页显示任务列表", notes = "传入task") - public R> pageList( - @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page, - @ApiParam(name = "size", value = "每页记录数", required = true) @PathVariable("size") Long size, - @SpringQueryMap TaskListQuery task) { - - BladePage result = taskService.pageList(page, size, task); - return R.data(result); - - } - - - // /** - // * 获取巡检情况列表信息 - // */ - // @RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST}) - // @ApiOperation(value = "任务查看弹窗下面的列表 巡检情况列表信息分页", notes = "传入taskId") - // public R> list(Long taskId, Query query, - // BladeUser bladeUser) { - // BladePage result = taskService.list(taskId, query, bladeUser); - // return R.data(result); - // - // } - - - /** - * 查看 - * - * @param id - * @return - */ - @GetMapping(value = "/detail") - @ApiOperation(value = "查看,下面列表再调用eventController.list", notes = "传入taskid") - public R detail(@RequestParam Long id) { - TaskEntity task = taskService.detail(id); - return R.data(task); - } - - - /** - * 任务查看弹窗下面的列表 - * - * @param taskId - * @param query - * @param bladeUser - * @return - */ - @GetMapping(value = "/event/list") - @ApiOperation(value = "任务查看弹窗下面的列表 巡检情况列表信息分页", notes = "传入taskId") - public R> eventList(Long taskId, Query query, - BladeUser bladeUser) { - - BladePage bladePage = taskService.eventList(taskId, query, bladeUser); - return R.data(bladePage); - } - - - /** - * 获取任务详情 - */ - @RequestMapping(value = "/getTaskById", method = {RequestMethod.GET, RequestMethod.POST}) - @ApiOperation(value = "获取任务详情", notes = "传入taskId") - public R> getTaskById(@RequestParam Long id) { - List taskObjectVOS = taskService.getTaskById(id); - return R.data(taskObjectVOS); - } - - - - - /** - * 巡检计划统计 - */ - @GetMapping("/getTaskListStatistics") - @ApiOperation(value = "巡检计划统计", notes = "传入计划id") - public R> getTaskListStatistics(@RequestParam String startTime, @RequestParam String endTime, - @RequestParam Long deptId){ - List taskObjectVOS = taskService.getTaskListStatistics(startTime,endTime,deptId); - return R.data(taskObjectVOS); - - } -} - - - - diff --git a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/IDigitalBaseInfoService.java b/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/IDigitalBaseInfoService.java deleted file mode 100644 index 514c751..0000000 --- a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/IDigitalBaseInfoService.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.hnac.hzims.twindisplay.service; - -import com.hnac.hzims.hzimsweather.response.weather.HeWeatherWeatherNowResponse; -import com.hnac.hzims.hzimsweather.vo.RainFallCountByMonthVo; -import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; - -import java.util.List; -import java.util.Map; - -public interface IDigitalBaseInfoService { - - /** - * 获取日期时间信息 - * @return - */ - Map getDateInfo(); - - /** - * 获取气象信息 - * @param location - * @return - */ - HeWeatherWeatherNowResponse getWeatherInfo(String location); - - /** - * 获取水位信息 - * @param instanceCode - * @param signage - * @return - */ - double getWaterLevel(String instanceCode, String signage); - - /** - * 获取设备信息 - * @param deviceCode - * @return - */ - List getRealData(String deviceCode); - - /** - * 获取地区降雨量信息 - * @param year - * @param location - * @return - */ - Map> getRainFallInfo(String year, String location); - - /** - * 获取电站发电运行信息 - * @param deviceCode - * @param activePower - * @param reactivePower - * @param power - * @return - */ - Map getPowerStationHisInfo(String deviceCode, String activePower, String reactivePower, String power); -} diff --git a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/RouteService.java b/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/RouteService.java deleted file mode 100644 index 5abf64f..0000000 --- a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/RouteService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hnac.hzims.twindisplay.service; - -import com.hnac.hzinfo.inspect.plan.entity.RouteEntity; -import org.springblade.core.mp.support.BladePage; -import org.springblade.core.mp.support.Query; - -import java.util.Map; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/25 10:12 - */ -public interface RouteService { - - /** - * 查询巡检路径管理列表 - * @param stReRoute - * @param query - * @return - */ - BladePage listRoute(Map stReRoute, Query query); - - /** - * 新增 - * @param stReRoute - */ - void save(RouteEntity stReRoute); - - - /** - * 修改 - * @param stReRoute - */ - void update(RouteEntity stReRoute); - - - /** - * 删除 - * @param ids - */ - void remove(String ids); -} diff --git a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/StatisticsService.java b/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/StatisticsService.java deleted file mode 100644 index 2e856f1..0000000 --- a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/StatisticsService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hnac.hzims.twindisplay.service; - -import com.hnac.hzims.operational.defect.vo.OperDefectStatisticsVO; -import com.hnac.hzims.operational.defect.vo.StatistictCountVo; -import org.springblade.core.mp.support.BladePage; - -import java.util.List; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/25 15:28 - */ -public interface StatisticsService { - - - /** - * 缺陷管理 - * @param entity - * @return - */ - BladePage list(OperDefectStatisticsVO entity); - - - /** - * 巡检任务统计 - * @return - */ - List defectStatistictCount(); - -} diff --git a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/TaskService.java b/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/TaskService.java deleted file mode 100644 index 34f40ee..0000000 --- a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/TaskService.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.hnac.hzims.twindisplay.service; - -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 org.springblade.core.mp.support.BladePage; -import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.BladeUser; - -import java.util.List; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/25 13:49 - */ -public interface TaskService { - - - /** - * 巡检任务分页 - * @param page - * @param size - * @param task - * @return - */ - BladePage pageList(Long page, Long size, TaskListQuery task); - - // - // /** - // * 获取巡检情况列表信息 - // * @param taskId - // * @param query - // * @param bladeUser - // * @return - // */ - // BladePage list(Long taskId, Query query, BladeUser bladeUser); - - - /** - * 根据id获取检修任务 - * @param id - * @return - */ - TaskEntity detail(Long id); - - - /** - * 任务查看弹窗下面的列表 - * @param taskId - * @param query - * @param bladeUser - * @return - */ - BladePage eventList(Long taskId, Query query, BladeUser bladeUser); - - - /** - * 获取任务详情 - * @param id - * @return - */ - List getTaskById(Long id); - - - /** - * 巡检计划统计 - * @param startTime - * @param endTime - * @param deptId - * @return - */ - List getTaskListStatistics(String startTime, String endTime, Long deptId); -} diff --git a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/impl/DigitalBaseInfoServiceImpl.java b/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/impl/DigitalBaseInfoServiceImpl.java deleted file mode 100644 index db70c87..0000000 --- a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/impl/DigitalBaseInfoServiceImpl.java +++ /dev/null @@ -1,203 +0,0 @@ -package com.hnac.hzims.twindisplay.service.impl; - -import com.hnac.hzims.damsafety.feign.IWrpSectionBClient; -import com.hnac.hzims.hzimsweather.feign.IHeWeatherWeatherClient; -import com.hnac.hzims.hzimsweather.response.weather.HeWeatherWeatherNowResponse; -import com.hnac.hzims.hzimsweather.vo.RainFallCountByMonthVo; -import com.hnac.hzims.twindisplay.service.IDigitalBaseInfoService; -import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient; -import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; -import com.hnac.hzinfo.datasearch.analyse.po.AnalyseCodeByAnalyseDataPO; -import com.hnac.hzinfo.datasearch.analyse.po.AnalyzeDataConditionPO; -import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeDataConditionVO; -import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO; -import com.hnac.hzinfo.sdk.analyse.AnalyseDataSearchClient; -import com.hnac.hzinfo.sdk.core.response.Result; -import lombok.RequiredArgsConstructor; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.CollectionUtil; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.tool.utils.ObjectUtil; -import org.springblade.core.tool.utils.StringUtil; -import org.springframework.stereotype.Service; - -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.util.*; - -@Service -@RequiredArgsConstructor -public class DigitalBaseInfoServiceImpl implements IDigitalBaseInfoService { - - private final IHeWeatherWeatherClient heWeatherWeatherClient; - - private final IAnalyseDataSearchClient ianalyseDataSearchClient; - - private final IWrpSectionBClient wrpSectionBClient; - - private final AnalyseDataSearchClient analyseDataSearchClient; - - @Override - public Map getDateInfo() { - Map info = new HashMap<>(3); - Date now = new Date(); - SimpleDateFormat dateFm1 = new SimpleDateFormat("EEEE"); - SimpleDateFormat dateFm2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - //获取当前日期是星期几，中文展示 e.g. 星期二 - String week = dateFm1.format(now); - String dateTime = dateFm2.format(now); - String[] s = dateTime.split(" "); - info.put("date", s[0]); - info.put("time", s[1]); - info.put("week", week); - return info; - } - - @Override - public HeWeatherWeatherNowResponse getWeatherInfo(String location) { - if(StringUtil.isEmpty(location)){ - return null; - } - // 天气feign接口查询实时天气 - R result = heWeatherWeatherClient.getWeatherNowWithCache(location); - if(!result.isSuccess() || ObjectUtil.isEmpty(result)){ - return null; - } - return result.getData(); - } - - @Override - public double getWaterLevel(String instanceCode, String signage) { - - RealDataSearchPO realData = new RealDataSearchPO(); - realData.setAnalyzeCode(instanceCode); - List signages = Collections.singletonList(signage); - realData.setSignages(signages); - // 调用fegin接口查询实时数据 - R> R = ianalyseDataSearchClient.getRealDataByAnalyzeCode(realData); - if(!R.isSuccess() || CollectionUtil.isEmpty(R.getData())){ - return 0.0; - } - // 时间限制 - String time = R.getData().get(0).getTime(); - if(StringUtil.isEmpty(time) || "-".equals(time)){ - return 0.0; - } - Date date = DateUtil.parse(time, "yyyy-MM-dd HH:mm:ss.sss"); - if(System.currentTimeMillis() - date.getTime() > 30 * 60 * 1000L){ - return 0.0; - } - return Double.parseDouble(R.getData().get(0).getValue()); - } - - @Override - public List getRealData(String deviceCode) { - R> realData = wrpSectionBClient.getRealData(deviceCode); - if(!realData.isSuccess() || CollectionUtil.isEmpty(realData.getData())){ - return null; - } - return realData.getData(); - } - - @Override - public Map> getRainFallInfo(String year, String location) { - R>> result = heWeatherWeatherClient.getRainFallMonthCount(year, location); - if(!result.isSuccess() || CollectionUtil.isEmpty(result.getData())){ - return null; - } - return result.getData(); - } - - @Override - public Map getPowerStationHisInfo(String deviceCode, String activePower, String reactivePower, String power) { - R> realData = wrpSectionBClient.getRealData(deviceCode); - - Map result = new HashMap<>(); - if(realData.isSuccess() && CollectionUtil.isNotEmpty(realData.getData())){ - List datas = realData.getData(); - datas.stream().forEach(data -> { - if (activePower.equals(data.getSignage())) { - //有功功率 - result.put(activePower, data.getValue()); - } - if (reactivePower.equals(data.getSignage())) { - //无功功率 - result.put(reactivePower, data.getValue()); - } - }); - } - - //当前年的第一天 2023-1-1 - LocalDate year = LocalDate.now().withDayOfYear(1); - //当前月的第一天 2023-8-1 - LocalDate month = LocalDate.now().withDayOfMonth(1); - //当天 2023-8-29 - LocalDate day = LocalDate.now(); - LocalTime startTime = LocalTime.MIN; - - - LocalDateTime end = LocalDateTime.now(); - - //年累计 - LocalDateTime start = LocalDateTime.of(year, startTime); - AnalyseCodeByAnalyseDataPO poForYear = getPowerByParam(deviceCode, start, end, 4, 6, 1); - Result> listForYear = analyseDataSearchClient.getAnalyzeDataByAnalyzeCodeAndSignages(poForYear); - - //月累计 - start = LocalDateTime.of(month, startTime); - AnalyseCodeByAnalyseDataPO poForMonth = getPowerByParam(deviceCode, start, end, 4, 5, 1); - Result> listForMonth = analyseDataSearchClient.getAnalyzeDataByAnalyzeCodeAndSignages(poForMonth); - - //日累计 - start = LocalDateTime.of(day, startTime); - AnalyseCodeByAnalyseDataPO poForDay = getPowerByParam(deviceCode, start, end, 4, 4, 1); - Result> listForDay = analyseDataSearchClient.getAnalyzeDataByAnalyzeCodeAndSignages(poForDay); - - //日发电计划完成率 - result.put("dayPowerRate",null); - //月发电计划完成率 - result.put("monthPowerRate",null); - //日累计发电量 - result.put("dayPowerSum",null); - //月累计发电量 - result.put("monthPowerSum",null); - //年累计发电量 - result.put("yearPowerSum",null); - return result; - } - - /** - * 根据入参查询设备信息 - * @param deviceCode 设备编号 - * @param start 开始时间 - * @param end 结束时间 - * @param accessRules 取数规则0=最早值、1=最大值、2=最小值、3=平均值、4=（累计值/和值)、5=（变化值/差值） 6=最新值 - * @param saveTimeType 周期类型: 0-> s(秒) 1->m(分) 2->h(小时) 3->d(天) 4->w(周) 5->n(自然月) 6->y(自然年) - * @param timeInterval 间隔时间 - * @return - */ - public AnalyseCodeByAnalyseDataPO getPowerByParam(String deviceCode, LocalDateTime start, LocalDateTime end, - Integer accessRules, Integer saveTimeType, Integer timeInterval) { - AnalyseCodeByAnalyseDataPO po = new AnalyseCodeByAnalyseDataPO(); - po.setDeviceCode(deviceCode); - - List signboardConditions = new ArrayList<>(); - AnalyzeDataConditionPO conditionPO = new AnalyzeDataConditionPO(); - - conditionPO.setBeginTime(start); - conditionPO.setEndTime(end); - conditionPO.setSignages(deviceCode); -// conditionPO.setKeepFigures(3); - conditionPO.setAccessRules(accessRules); - conditionPO.setSaveTimeType(saveTimeType); - conditionPO.setTimeInterval(timeInterval); - conditionPO.setFull(1); - signboardConditions.add(conditionPO); - po.setSignboardConditions(signboardConditions); - return po; - } - - -} diff --git a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/impl/RouteServiceImpl.java b/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/impl/RouteServiceImpl.java deleted file mode 100644 index 71aff48..0000000 --- a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/impl/RouteServiceImpl.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.hnac.hzims.twindisplay.service.impl; - -import com.hnac.hzims.twindisplay.service.RouteService; -import com.hnac.hzinfo.inspect.plan.entity.RouteEntity; -import com.hnac.hzinfo.inspect.threedimensional.fegin.RouteFeignClient; -import lombok.extern.slf4j.Slf4j; -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.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/25 10:12 - */ -@Slf4j -@Service("RouteServiceImpl") -public class RouteServiceImpl implements RouteService { - - - @Autowired - private RouteFeignClient routeFeignClient; - - /** - * 查询巡检路径管理列表 - * - * @param stReRoute - * @param query - * @return - */ - @Override - public BladePage listRoute(Map stReRoute, Query query) { - R> list = routeFeignClient.list(stReRoute, query); - if (list.isSuccess()) { - return list.getData(); - } - log.error("RouteFeignClient 调用错误"); - return null; - } - - /** - * 新增 - * - * @param stReRoute - */ - @Override - public void save(RouteEntity stReRoute) { - R save = routeFeignClient.save(stReRoute); - if (!save.isSuccess()) { - throw new ServiceException("保存失败"); - } - } - - /** - * 修改 - * - * @param stReRoute - */ - @Override - public void update(RouteEntity stReRoute) { - R update = routeFeignClient.update(stReRoute); - if (!update.isSuccess()) { - throw new ServiceException("数据不存在"); - } - } - - /** - * 删除 - * - * @param ids - */ - @Override - public void remove(String ids) { - - } -} diff --git a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/impl/StatisticsServiceImpl.java b/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/impl/StatisticsServiceImpl.java deleted file mode 100644 index fbb3cc8..0000000 --- a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/impl/StatisticsServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hnac.hzims.twindisplay.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.operational.defect.feign.StatisticsFeignClient; -import com.hnac.hzims.operational.defect.vo.OperDefectStatisticsVO; -import com.hnac.hzims.operational.defect.vo.StatistictCountVo; -import com.hnac.hzims.twindisplay.service.StatisticsService; -import org.springblade.core.mp.support.BladePage; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/25 15:30 - */ -@Service -public class StatisticsServiceImpl implements StatisticsService { - - @Autowired - private StatisticsFeignClient statisticsFeignClient; - - /** - * 缺陷管理 - * - * @param entity - * @return - */ - @Override - public BladePage list(OperDefectStatisticsVO entity) { - R> list = statisticsFeignClient.list(entity); - if (list.isSuccess()) { - return list.getData(); - } - return null; - } - - /** - * 巡检任务统计 - * - * @return - */ - @Override - public List defectStatistictCount() { - - R> r = statisticsFeignClient.defectStatistictCount(); - if (r.isSuccess()) { - return r.getData(); - } - return null; - } -} diff --git a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/impl/TaskServiceImpl.java b/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/impl/TaskServiceImpl.java deleted file mode 100644 index ab88bc4..0000000 --- a/hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/service/impl/TaskServiceImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.hnac.hzims.twindisplay.service.impl; - -import com.hnac.hzims.twindisplay.service.TaskService; -import com.hnac.hzims.vo.VoteChartVo; -import com.hnac.hzinfo.inspect.areamonthly.feign.TaskFeignClient; -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 lombok.extern.slf4j.Slf4j; -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.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/8/25 13:50 - */ -@Slf4j -@Service -public class TaskServiceImpl implements TaskService { - - - @Autowired - @Lazy - private TaskFeignClient taskFeignClient; - - /** - * 巡检任务分页 - * - * @param page - * @param size - * @param task - * @return - */ - @Override - public BladePage pageList(Long page, Long size, TaskListQuery task) { - R> pagedList = taskFeignClient.pageList(page, size, task); - if (pagedList.isSuccess()) { - return pagedList.getData(); - } - log.error("巡检任务调用失败"); - return null; - } - - // /** - // * 获取巡检情况列表信息 - // * - // * @param taskId - // * @param query - // * @param bladeUser - // * @return - // */ - // @Override - // public BladePage list(Long taskId, Query query, BladeUser bladeUser) { - // R> bladePageR = taskFeignClient.list(taskId, query, bladeUser); - // if (bladePageR.isSuccess()) { - // return bladePageR.getData(); - // } - // return null; - // } - - /** - * 根据id获取检修任务 - * - * @param id - * @return - */ - @Override - public TaskEntity detail(Long id) { - R detail = taskFeignClient.detail(id); - if (detail.isSuccess()) { - return detail.getData(); - } - return null; - } - - /** - * 任务查看弹窗下面的列表 - * - * @param taskId - * @param query - * @param bladeUser - * @return - */ - @Override - public BladePage eventList(Long taskId, Query query, BladeUser bladeUser) { - R> eventList = taskFeignClient.eventList(taskId, query, bladeUser); - if (eventList.isSuccess()) { - return eventList.getData(); - } - return null; - } - - /** - * 获取任务详情 - * - * @param id - * @return - */ - @Override - public List getTaskById(Long id) { - R> taskById = taskFeignClient.getTaskById(id); - if (taskById.isSuccess()) { - return taskById.getData(); - } - return null; - } - - /** - * 巡检计划统计 - * - * @param startTime - * @param endTime - * @param deptId - * @return - */ - @Override - public List getTaskListStatistics(String startTime, String endTime, Long deptId) { - R> taskListStatistics = taskFeignClient.getTaskListStatistics(startTime, endTime, deptId); - if (taskListStatistics.isSuccess()) { - return taskListStatistics.getData(); - } - return null; - } -} diff --git a/hzims-service/digital-twin-display/src/main/resources/application-dev.yml b/hzims-service/digital-twin-display/src/main/resources/application-dev.yml deleted file mode 100644 index 50a4ea7..0000000 --- a/hzims-service/digital-twin-display/src/main/resources/application-dev.yml +++ /dev/null @@ -1,30 +0,0 @@ -#服务器端口 -server: - port: 8200 - -#数据源配置 -#spring: -# datasource: -# url: ${blade.datasource.dev.url} -# username: ${blade.datasource.dev.username} -# password: ${blade.datasource.dev.password} - -spring: - #排除DruidDataSourceAutoConfigure - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - datasource: - dynamic: - #设置默认的数据源或者数据源组,默认值即为master - primary: master - datasource: - master: - url: jdbc:mysql://127.0.0.1:3306/equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true - username: root - password: 123456 - slave: - url: jdbc:mysql://127.0.0.1:3306/equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true - username: root - password: 123456 -demo: - name: aaa diff --git a/hzims-service/digital-twin-display/src/main/resources/application-prod.yml b/hzims-service/digital-twin-display/src/main/resources/application-prod.yml deleted file mode 100644 index da89262..0000000 --- a/hzims-service/digital-twin-display/src/main/resources/application-prod.yml +++ /dev/null @@ -1,28 +0,0 @@ -#服务器端口 -server: - port: 8200 - -#数据源配置 -#spring: -# datasource: -# url: ${blade.datasource.prod.url} -# username: ${blade.datasource.prod.username} -# password: ${blade.datasource.prod.password} - -spring: - #排除DruidDataSourceAutoConfigure - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - datasource: - dynamic: - #设置默认的数据源或者数据源组,默认值即为master - primary: master - datasource: - master: - url: ${blade.datasource.demo.master.url} - username: ${blade.datasource.demo.master.username} - password: ${blade.datasource.demo.master.password} - slave: - url: ${blade.datasource.demo.slave.url} - username: ${blade.datasource.demo.slave.username} - password: ${blade.datasource.demo.slave.password} diff --git a/hzims-service/digital-twin-display/src/main/resources/application.yml b/hzims-service/digital-twin-display/src/main/resources/application.yml deleted file mode 100644 index de3d915..0000000 --- a/hzims-service/digital-twin-display/src/main/resources/application.yml +++ /dev/null @@ -1,21 +0,0 @@ -#mybatis-plus配置 -mybatis-plus: - mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml - #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.hnac.hzims.**.entity - -#swagger扫描路径配置 -swagger: - base-packages: - - org.springbalde - - com.hnac - - - -spring: - datasource: - url: jdbc:mysql://192.168.65.124:3576/hzinfo_data?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true - username: hzinfo - password: 1qaz2WSX! - - - diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/MachineryTicketProcessServiceImpl.java b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/MachineryTicketProcessServiceImpl.java index 7748d4f..48d0154 100644 --- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/MachineryTicketProcessServiceImpl.java +++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/MachineryTicketProcessServiceImpl.java @@ -45,7 +45,7 @@ public class MachineryTicketProcessServiceImpl extends ProcessAbstractService { @Override public Boolean isWorkflowProcess(WorkflowQueue flowQueue) { log.info("是否执行水力机械工作票流程环节操作~~~~,流程ticket: {}", flowQueue); - String dictValue = processDictService.selectDictValueByKey(flowQueue.getProcessDefinitionKey()); + String dictValue = processDictService.selectDictValueByKey(MACHINERY_TICKET_KEY); if (dictValue.equals(flowQueue.getProcessDefinitionKey())) { log.info("已执行水力机械工作票流程环节操作~~~~"); return true; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ContentMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/InspectContentMapper.java similarity index 76% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ContentMapper.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/InspectContentMapper.java index 159ec5c..cad89ee 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ContentMapper.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/InspectContentMapper.java @@ -8,5 +8,5 @@ import org.apache.ibatis.annotations.Mapper; * @author ysj */ @Mapper -public interface ContentMapper extends BaseMapper{ +public interface InspectContentMapper extends BaseMapper{ } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ObjectMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/InspectObjectMapper.java similarity index 77% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ObjectMapper.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/InspectObjectMapper.java index b130b94..2785f87 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ObjectMapper.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/InspectObjectMapper.java @@ -8,6 +8,6 @@ import org.apache.ibatis.annotations.Mapper; * @author ysj */ @Mapper -public interface ObjectMapper extends BaseMapper { +public interface InspectObjectMapper extends BaseMapper { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskMapper.java index 1a4a34b..6cf873d 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskMapper.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskMapper.java @@ -1,13 +1,13 @@ package com.hnac.hzims.scheduled.mapper.inspect; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzinfo.inspect.task.entity.TaskEntity; import org.apache.ibatis.annotations.Mapper; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; /** * @author ysj */ @Mapper -public interface TaskMapper extends UserDataScopeBaseMapper { +public interface TaskMapper extends BaseMapper { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskPlanMapper.java similarity index 56% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanMapper.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskPlanMapper.java index e4a1c2d..6faf295 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanMapper.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskPlanMapper.java @@ -1,12 +1,12 @@ package com.hnac.hzims.scheduled.mapper.inspect; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzinfo.inspect.plan.entity.PlanEntity; import org.apache.ibatis.annotations.Mapper; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; /** * @author ysj */ @Mapper -public interface PlanMapper extends UserDataScopeBaseMapper { +public interface TaskPlanMapper extends BaseMapper { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BusinessScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BusinessScheduledTask.java deleted file mode 100644 index f908b36..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BusinessScheduledTask.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hnac.hzims.scheduled.scheduled; - -import com.hnac.hzims.scheduled.service.inspect.TaskService; -import com.hnac.hzims.scheduled.service.operation.business.MaintenanceService; -import com.xxl.job.core.biz.model.ReturnT; -import com.xxl.job.core.handler.annotation.XxlJob; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.tool.utils.Func; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import java.util.Date; -import static com.hnac.hzinfo.inspect.task.TaskContants.*; - - -/** - * 业务模块定时任务 - * @author ysj - */ -@Slf4j -@Component -public class BusinessScheduledTask { - - @Autowired - private TaskService service; - - private MaintenanceService maintenanceService; - - /** - * 巡检任务派发 : 一分钟执行一次 - */ - @XxlJob(INSPECT_TASK_DISTRIBUTE) - //@Scheduled(cron = "0/40 * * * * ? ") - public ReturnT inspectTaskDistribute(String param) { - if (Func.isBlank(param)) { - param = DateUtil.format(new Date(), "yyyy-MM"); - } - service.inspectTaskDistribute(param); - return new ReturnT<>("SUCCESS"); - } - - /** - * 巡检任务派发 : 一天执行一次 凌晨0时执行 - */ - @XxlJob(MAINTENANCE_TASK_DISTRIBUTE) - //@Scheduled(cron = "0/40 * * * * ? ") - public ReturnT maintenanceTaskDistribute(String param) { - if (Func.isBlank(param)) { - param = DateUtil.format(new Date(), "yyyy-MM"); - } - maintenanceService.maintenanceTaskDistribute(param); - return new ReturnT<>("SUCCESS"); - } - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ContentService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ContentService.java deleted file mode 100644 index f1f04cf..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ContentService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.obj.entity.ContentEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface ContentService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectService.java deleted file mode 100644 index 7512337..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.obj.entity.ObjectEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface ObjectService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectUserService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectUserService.java deleted file mode 100644 index 2963621..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectUserService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.obj.entity.ObjectUserEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface ObjectUserService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanObjectTemplateService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanObjectTemplateService.java deleted file mode 100644 index 9c7314f..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanObjectTemplateService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.plan.entity.PlanObjectTemplateEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface PlanObjectTemplateService extends BaseService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanOrgService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanOrgService.java deleted file mode 100644 index 3372f82..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanOrgService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.plan.entity.PlanOrgEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface PlanOrgService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanPositionService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanPositionService.java deleted file mode 100644 index 334cfc6..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanPositionService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.plan.entity.PlanPositionEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface PlanPositionService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanService.java deleted file mode 100644 index ac2b6aa..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.plan.entity.PlanEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface PlanService extends BaseService { - - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanUserService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanUserService.java deleted file mode 100644 index 7634f14..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanUserService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.plan.entity.PlanUserEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * 巡检计划用户模板服务类 - * - * @author Chill - */ -public interface PlanUserService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectContentService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectContentService.java deleted file mode 100644 index 82cd962..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectContentService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - - -import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface ProjectContentService extends BaseService{ - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectService.java deleted file mode 100644 index ef2a474..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - - -import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface ProjectService extends BaseService{ - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectContentService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectContentService.java deleted file mode 100644 index 0db0ebb..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectContentService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface TaskObjectProjectContentService extends BaseService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectService.java deleted file mode 100644 index 400d84b..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface TaskObjectProjectService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectService.java deleted file mode 100644 index fb033a0..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface TaskObjectService extends BaseService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskRemindManager.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskRemindManager.java deleted file mode 100644 index 5ef3415..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskRemindManager.java +++ /dev/null @@ -1,295 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hnac.hzinfo.core.push.enums.PushAudienceType; -import com.hnac.hzinfo.core.push.model.PushAudience; -import com.hnac.hzinfo.core.push.model.PushInfo; -import com.hnac.hzinfo.core.push.model.PushPlatform; -import com.hnac.hzinfo.inspect.task.TaskContants; -import com.hnac.hzinfo.inspect.task.entity.TaskEntity; -import com.xxl.job.core.log.XxlJobLogger; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.sms.model.SmsResponse; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.CollectionUtil; -import org.springblade.core.tool.utils.Func; -import org.springblade.resource.feign.IPushClient; -import org.springblade.resource.feign.ISmsClient; -import org.springblade.resource.vo.PushInfoVO; -import org.springblade.system.user.cache.UserCache; -import org.springblade.system.user.entity.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.redis.core.DefaultTypedTuple; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Component; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.concurrent.*; -import java.util.stream.Collectors; - -/** - * 巡检任务通知、短信提醒管理器 - * 提醒列表使用redis缓存 - * - * @author py - */ -@Slf4j -@Component -public class TaskRemindManager { - - /** - * 巡检任务开始前发送短信信息阿里云模板 - **/ - @Value("${hzims.inspect.task.templateCode.taskBegin}") - private String taskBeginTemplateCode; - - /** - * 巡检任务结束前发送短信信息阿里云模板 - **/ - @Value("${hzims.inspect.task.templateCode.taskEnd}") - private String taskEndTemplateCode; - - /** - * 巡检消息推送模板 - 极光 - **/ - @Value("${hzims.inspect.task.jgPushCode}") - private String jgPushCode; - - @Autowired - private TaskService taskService; - @Autowired - private RedisTemplate redisTemplate; - @Autowired - private ISmsClient smsClient; - @Autowired - private IPushClient pushClient; - - - /** - * 开始前提醒任务列表 - */ - final static String REMIND_TASK_BEGIN_LIST = "hzinfo:remind:begin:tasks"; - /** - * 结束前提醒任务列表 - */ - final static String REMIND_TASK_END_LIST = "hzinfo:remind:end:tasks"; - - /** - * 开始 - * 重置redis开始提醒缓存列表 - * 按照时间排序 ： 正序 - */ - public void replaceBeginTaskCacheList(List taskBegin){ - //先删除 - redisTemplate.opsForZSet().removeRange(REMIND_TASK_BEGIN_LIST,0, -1); - setTaskBeginList(taskBegin); - } - - /** - * 结束 - * 重置redis结束提醒缓存列表 - * 按照时间排序 ： 正序 - */ - public void replaceEndTaskCacheList(List taskEnd){ - //先删除 - redisTemplate.opsForZSet().removeRange(REMIND_TASK_END_LIST,0, -1); - setTaskEndList(taskEnd); - } - - /** - * 开始 - * 任务批量加入redis提醒缓存列表中 - * - */ - public void setTaskBeginList(List tasks){ - HashSet set = new HashSet(); - - for (TaskEntity task : tasks) { - DefaultTypedTuple tuple = new DefaultTypedTuple<>(task, (double) task.getStartRemindTime().toEpochSecond(ZoneOffset.of("+8"))); - set.add(tuple); - } - if(Func.isNotEmpty(set)){ - redisTemplate.opsForZSet().add(REMIND_TASK_BEGIN_LIST, set); - } - } - - /** - * 结束 - * 任务批量加入redis提醒缓存列表中 - */ - public void setTaskEndList(List tasks){ - HashSet set = new HashSet(); - for (TaskEntity task : tasks) { - DefaultTypedTuple tuple = new DefaultTypedTuple<>(task, (double) task.getEndRemindTime().toEpochSecond(ZoneOffset.of("+8"))); - set.add(tuple); - } - if(Func.isNotEmpty(set)){ - redisTemplate.opsForZSet().add(REMIND_TASK_END_LIST, set); - } - } - - - /** - * 把任务加入redis提醒缓存列表中 - * 加入的时候 按照时间排序 ： 正序 - */ - public void addTaskToCacheList(TaskEntity task){ - DateTimeFormatter dfShort = DateTimeFormatter.ofPattern("yyyy-MM-dd "); - DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - - redisTemplate.expire(REMIND_TASK_BEGIN_LIST,365,TimeUnit.DAYS); - if(task.getStartRemindTime().isAfter(LocalDateTime.parse(dfShort.format(LocalDate.now()) + "00:00:00", df))){ - redisTemplate.opsForZSet().add(REMIND_TASK_BEGIN_LIST, task, task.getStartRemindTime().toEpochSecond(ZoneOffset.of("+8"))); - log.info("--------------- key = hzinfo:remind:begin:tasks ---- size = " + redisTemplate.opsForZSet().size(REMIND_TASK_BEGIN_LIST)); - } - - if(task.getEndRemindTime().isAfter(LocalDateTime.parse(dfShort.format(LocalDate.now()) + "00:00:00", df))){ - redisTemplate.opsForZSet().add(REMIND_TASK_END_LIST, task, task.getEndRemindTime().toEpochSecond(ZoneOffset.of("+8"))); - log.info("--------------- key = hzinfo:remind:end:tasks ---- size = " + redisTemplate.opsForZSet().size(REMIND_TASK_END_LIST)); - } - } - - /** - * 任务开始前 - */ - static final int BEGIN_SEND_FLAG = 1; - /** - * 任务结束前 - */ - static final int END_SEND_FLAG = 2; - - /** - * 任务开始、结束前提醒 - */ - public void taskRemind(){ - sendMsg(BEGIN_SEND_FLAG); - sendMsg(END_SEND_FLAG); - } - - /** - * 任务开始、结束前提醒 - */ - public void cleanCache(){ - long currentTime = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")); - String key = REMIND_TASK_BEGIN_LIST; - for (int i = 0; i < 2; i++) { - if(i == 1 ){ - key = REMIND_TASK_END_LIST; - } - Set tasks = redisTemplate.opsForZSet().rangeByScore(key,0, currentTime); - if(Func.isNotEmpty(tasks)){ - for (TaskEntity task : tasks) { - //用户id为空，删除数据 - redisTemplate.opsForZSet().remove(key, task); - } - } - log.info(key + " 清空cache后 ---- size = " + redisTemplate.opsForZSet().size(key)); - } - - } - - /** - * 任务开始/结束前 - * 推送消息、发送短信 - * @param sendFlag 发送标识：任务开始前提醒 1；任务结束前提醒 2； - */ - private void sendMsg(int sendFlag){ - //redis key; 消息推送标题; 短信模板code - String key = "", title = "", templateCode = ""; - - switch (sendFlag){ - case BEGIN_SEND_FLAG: - key = REMIND_TASK_BEGIN_LIST; - title = "任务开始前提醒"; - templateCode = taskBeginTemplateCode; - break; - case END_SEND_FLAG: - key = REMIND_TASK_END_LIST; - title = "任务结束前提醒"; - templateCode = taskEndTemplateCode; - break; - default: - break; - } - - DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - long currentTime = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")); - Set tasks = redisTemplate.opsForZSet().rangeByScore(key,0, currentTime); - if(Func.isNotEmpty(tasks)){ - //若该任务已完成 则无需再进行短信推送 - List taskIds = tasks.stream().map(TaskEntity::getId).collect(Collectors.toList()); - List undoneTaskList = taskService.list(Wrappers.lambdaQuery() - .ne(TaskEntity::getStatus, TaskContants.TaskStatusEnum.FINISH_STATUS.getStatus()) - .in(TaskEntity::getId, taskIds) - ); - if(CollectionUtil.isEmpty(undoneTaskList)) { - XxlJobLogger.log("巡检短信通知列表为空；redis内取出数据为：" + JSON.toJSONString(taskIds)); - return; - } - List undoneTaskIds = undoneTaskList.stream().map(TaskEntity::getId).collect(Collectors.toList()); - for (TaskEntity task : tasks) { - if(!undoneTaskIds.contains(task.getId())) { - XxlJobLogger.log(task.getId()+"巡检任务已完成，无需推送短信"); - return; - } - XxlJobLogger.log(task.getId()+"开始推送消息！"); - // 移动端消息推送 : 使用 用户id做TAG，前端注册用户id为TAG - PushInfoVO pushInfoVO = new PushInfoVO(); - pushInfoVO.setTenantId(task.getTenantId()); - PushPlatform platform = PushPlatform.all(); - Map> audienceMap = new HashMap<>(); - audienceMap.put(PushAudienceType.TAG, Collections.singletonList(task.getUserId().toString())); - PushAudience audience = new PushAudience(false, audienceMap); - PushInfo pushInfo = new PushInfo(jgPushCode - , title - , "任务“"+ task.getPlanName() + "”的计划执行时间是：" + df.format(task.getPlanStartTime())+ " —— " + df.format(task.getPlanEndTime()) - , "" - , null - , platform - , audience); - pushInfoVO.setPushInfo(pushInfo); - - Map smsMap = new HashMap<>(3); - smsMap.put("one", task.getPlanName()); - if(sendFlag == BEGIN_SEND_FLAG){ - smsMap.put("two", df.format(task.getPlanStartTime())); - } else if(sendFlag == END_SEND_FLAG){ - smsMap.put("two", df.format(task.getPlanEndTime())); - } //smsMap.put("three", df.format(task.getPlanEndTime())); - - - String jsonParam = JSON.toJSONString(smsMap); - - User user = UserCache.getUser(task.getUserId()); - String userPhone = Func.isNotEmpty(user) ? user.getPhone() : null; - log.info("------------ 发送短信 用户手机号 = " + userPhone); - - String finalTemplateCode = templateCode; - XxlJobLogger.log(task.getId()+"开始推送短信！"); - ThreadFactory threadFactory = Executors.defaultThreadFactory(); - ThreadPoolExecutor pool = new ThreadPoolExecutor(5, 5, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingDeque(), threadFactory); - pool.execute(() -> { - if(Func.isNotEmpty(userPhone)){ - // 发送短信 - R success = smsClient.sendMessage(task.getTenantId(), finalTemplateCode, jsonParam, userPhone); - log.info("msg -- 用户手机号：" + userPhone + " ; 短信内容：" + jsonParam + " ; TenantId：" + task.getTenantId() + " ; finalTemplateCode：" + finalTemplateCode + "；返回信息 = " + (Func.isNotEmpty(success)?success.toString(): "返回为空")); - } - //推送消息给移动端 - pushClient.tenantPush(pushInfoVO); - log.info("msg -- 推送信息完成" ); - }); - - //把已发送的数据移除 - // redisTemplate.opsForZSet().remove(key, task); - log.info("已推送、发送短信后 --------------- key = " + key + " ---- size = " + redisTemplate.opsForZSet().size(key)); - } - } - } - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskResultService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskResultService.java deleted file mode 100644 index 960f773..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskResultService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.task.entity.TaskResultEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface TaskResultService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java index 4e3aa2b..6d25531 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java @@ -11,7 +11,5 @@ import java.util.List; */ public interface TaskService extends BaseService { - void inspectTaskDistribute(String param); - DutyInspectTaskVO task(String start, String end, List areas); } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskUserService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskUserService.java deleted file mode 100644 index 558a4c6..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskUserService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.task.entity.TaskUserEntity; -import org.springblade.core.mp.base.BaseService; - -import java.util.List; - -/** - * @author ysj - */ -public interface TaskUserService extends BaseService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskVideoManager.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskVideoManager.java deleted file mode 100644 index bb53251..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskVideoManager.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.ai.vo.VideoReturnDTO; -import com.hnac.hzinfo.inspect.plan.PlanContants; -import com.hnac.hzinfo.inspect.task.entity.TaskEntity; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - - -/** - * 视频巡检任务 - * 提醒列表使用redis缓存 - * @Author: py - */ -@Component -public class TaskVideoManager { - - /** - * 视频巡检任务列表 - */ - final static String VIDEO_TASK_LIST = "hzinfo:video:tasks"; - - /** - * 视频巡检 AI识别结果列表 - */ - final static String VIDEO_TASK_AI_RESULT= "hzinfo:video:ai:results"; - - @Autowired - private RedisTemplate redisTemplate; - - /** - * 把AI识别结果加入redis缓存中 - */ - public void addAiResultToMap(VideoReturnDTO returnDTO){ - redisTemplate.opsForHash().put(VIDEO_TASK_AI_RESULT, returnDTO.getVideo(), returnDTO); - } - - /** - * 从redis缓存中取出AI识别结果 - */ - public VideoReturnDTO getAiResultFromMap(String video){ - if(redisTemplate.opsForHash().hasKey(VIDEO_TASK_AI_RESULT, video)){ - return (VideoReturnDTO)redisTemplate.opsForHash().get(VIDEO_TASK_AI_RESULT, video); - } - return null; - } - - - - /** - * 把任务加入redis提醒缓存列表中 - */ - public void addTaskToVideoCacheList(TaskEntity task){ - if(task.getAutoVideo().equals(PlanContants.InspectTypeEnum.VIDEO.getVal())){ - redisTemplate.opsForHash().put(VIDEO_TASK_LIST, task.getId(), task); - } - } - - - /** - * 把任务加入redis提醒缓存列表中 - */ - public void deleteTaskFromCacheList(TaskEntity task){ - redisTemplate.opsForHash().delete(VIDEO_TASK_LIST, task.getId()); - } - - - /** - * - */ - public void deleteTaskFromCacheList(String taskId){ - redisTemplate.opsForHash().delete(VIDEO_TASK_LIST, taskId); - } - - /** - * 从缓存中取出当前时间加一分钟之前的所有数据 - */ - public List getTasksFromCacheList(){ - List tasks = new ArrayList<>(); - HashMap map = (HashMap) redisTemplate.opsForHash().entries(VIDEO_TASK_LIST); - map.forEach((id, task) ->{ - if(task.getPlanStartTime().isBefore(LocalDateTime.now().plusMinutes(1L))){ - tasks.add(task); - deleteTaskFromCacheList(id); - } - }); - return tasks; - } - - - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateProjectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateProjectService.java deleted file mode 100644 index d67b8df..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateProjectService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - - -import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface TemplateProjectService extends BaseService{ - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateService.java deleted file mode 100644 index f0e8005..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface TemplateService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ContentServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ContentServiceImpl.java deleted file mode 100644 index b182d6e..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ContentServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.ContentMapper; -import com.hnac.hzims.scheduled.service.inspect.ContentService; -import com.hnac.hzinfo.inspect.obj.entity.ContentEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class ContentServiceImpl extends BaseServiceImpl implements ContentService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectServiceImpl.java deleted file mode 100644 index 4aa787a..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.ObjectMapper; -import com.hnac.hzims.scheduled.service.inspect.ObjectService; -import com.hnac.hzinfo.inspect.obj.entity.ObjectEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - - -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class ObjectServiceImpl extends BaseServiceImpl implements ObjectService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectUserServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectUserServiceImpl.java deleted file mode 100644 index 8f09fa0..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectUserServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.ObjectUserMapper; -import com.hnac.hzims.scheduled.service.inspect.ObjectUserService; -import com.hnac.hzinfo.inspect.obj.entity.ObjectUserEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class ObjectUserServiceImpl extends BaseServiceImpl implements ObjectUserService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanObjectTemplateServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanObjectTemplateServiceImpl.java deleted file mode 100644 index 4e63cdc..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanObjectTemplateServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.PlanObjectTemplateMapper; -import com.hnac.hzims.scheduled.service.inspect.PlanObjectTemplateService; -import com.hnac.hzinfo.inspect.plan.entity.PlanObjectTemplateEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class PlanObjectTemplateServiceImpl extends BaseServiceImpl implements PlanObjectTemplateService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanOrgServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanOrgServiceImpl.java deleted file mode 100644 index 4606dad..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanOrgServiceImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.hnac.hzims.scheduled.mapper.inspect.PlanOrgMapper; -import com.hnac.hzims.scheduled.service.inspect.PlanOrgService; -import com.hnac.hzinfo.inspect.plan.entity.PlanOrgEntity; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -public class PlanOrgServiceImpl extends BaseServiceImpl implements PlanOrgService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanPositionServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanPositionServiceImpl.java deleted file mode 100644 index 2cff9b7..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanPositionServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.PlanPositionMapper; -import com.hnac.hzims.scheduled.service.inspect.PlanPositionService; -import com.hnac.hzinfo.inspect.plan.entity.PlanPositionEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class PlanPositionServiceImpl extends BaseServiceImpl implements PlanPositionService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanServiceImpl.java deleted file mode 100644 index 4ac6701..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.PlanMapper; -import com.hnac.hzims.scheduled.service.inspect.PlanService; -import com.hnac.hzinfo.inspect.plan.entity.PlanEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class PlanServiceImpl extends BaseServiceImpl implements PlanService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanUserServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanUserServiceImpl.java deleted file mode 100644 index 6364750..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanUserServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.PlanUserMapper; -import com.hnac.hzims.scheduled.service.inspect.PlanUserService; -import com.hnac.hzinfo.inspect.plan.entity.PlanUserEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class PlanUserServiceImpl extends BaseServiceImpl implements PlanUserService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectContentServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectContentServiceImpl.java deleted file mode 100644 index d71a052..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectContentServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.ProjectContentMapper; -import com.hnac.hzims.scheduled.service.inspect.ProjectContentService; -import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class ProjectContentServiceImpl extends BaseServiceImpl implements ProjectContentService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectServiceImpl.java deleted file mode 100644 index 6da2ded..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.ProjectMapper; -import com.hnac.hzims.scheduled.service.inspect.ProjectService; -import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class ProjectServiceImpl extends BaseServiceImpl implements ProjectService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectContentServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectContentServiceImpl.java deleted file mode 100644 index f9eb13a..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectContentServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.TaskObjectProjectContentMapper; -import com.hnac.hzims.scheduled.service.inspect.TaskObjectProjectContentService; -import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class TaskObjectProjectContentServiceImpl extends BaseServiceImpl implements TaskObjectProjectContentService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectServiceImpl.java deleted file mode 100644 index 7eeaf59..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.TaskObjectProjectMapper; -import com.hnac.hzims.scheduled.service.inspect.TaskObjectProjectService; -import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class TaskObjectProjectServiceImpl extends BaseServiceImpl implements TaskObjectProjectService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectServiceImpl.java deleted file mode 100644 index 6fdb9b1..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.TaskObjectMapper; -import com.hnac.hzims.scheduled.service.inspect.TaskObjectService; -import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class TaskObjectServiceImpl extends BaseServiceImpl implements TaskObjectService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskResultServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskResultServiceImpl.java deleted file mode 100644 index 11f66c0..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskResultServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.TaskResultMapper; -import com.hnac.hzims.scheduled.service.inspect.TaskResultService; -import com.hnac.hzinfo.inspect.task.entity.TaskResultEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class TaskResultServiceImpl extends BaseServiceImpl implements TaskResultService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java index 0aea939..a0f0c99 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java @@ -1,45 +1,17 @@ package com.hnac.hzims.scheduled.service.inspect.impl; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.google.common.collect.Lists; -import com.hnac.hzims.operational.duty.vo.ImsDutyMainFeignVO; import com.hnac.hzims.scheduled.mapper.inspect.TaskMapper; -import com.hnac.hzims.scheduled.service.inspect.*; -import com.hnac.hzims.scheduled.service.operation.business.DutyMainService; -import com.hnac.hzinfo.inspect.obj.entity.*; -import com.hnac.hzinfo.inspect.plan.PlanContants; -import com.hnac.hzinfo.inspect.plan.entity.*; -import com.hnac.hzinfo.inspect.task.TaskContants; -import com.hnac.hzinfo.inspect.task.entity.*; +import com.hnac.hzims.scheduled.service.inspect.TaskService; +import com.hnac.hzinfo.inspect.task.entity.TaskEntity; import com.hnac.hzinfo.inspect.task.vo.DutyInspectTaskVO; -import com.xxl.job.core.log.XxlJobLogger; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.CollectionUtil; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.tool.utils.Func; -import org.springblade.core.tool.utils.ObjectUtil; -import org.springblade.system.user.entity.User; -import org.springblade.system.user.feign.IUserClient; import org.springframework.stereotype.Service; -import java.time.DayOfWeek; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.time.temporal.WeekFields; -import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; @@ -52,687 +24,6 @@ import java.util.stream.Collectors; @DS("inspect") public class TaskServiceImpl extends BaseServiceImpl implements TaskService { - private final PlanService planService; - - private final ObjectService objectService; - - private final PlanOrgService planOrgService; - - private final ContentService contentService; - - private final ProjectService projectService; - - private final TemplateService templateService; - - private final DutyMainService dutyMainService; - - private final PlanUserService planUserService; - - private final TaskUserService taskUserService; - - private final ObjectUserService objectUserService; - - private final TaskResultService taskResultService; - - private final TaskObjectService taskObjectService; - - private final PlanPositionService planPostionService; - - private final ProjectContentService projectContentService; - - private final TemplateProjectService templateProjectService; - - private final TaskObjectProjectService taskObjectProjectService; - - private final PlanObjectTemplateService planObjectTemplateService; - - private final TaskObjectProjectContentService taskObjectProjectContentService; - - private final TaskVideoManager taskVideoManager; - - private final TaskRemindManager remindCacheManager; - - private final IUserClient userClient; - - /** - * 巡检任务派发 - * @param param - */ - @Override - public void inspectTaskDistribute(String param) { - // 清理无效任务 - this.close(); - - // 派发任务状态前置修改 - this.status(); - - // 遍历派发任务 - this.distribute(); - } - - - /** - * 清理无效任务 - */ - private void close() { - // 关闭超过计划结束时间 、已审核 、派发中的巡检计划 - UpdateWrapper plan = new UpdateWrapper<>(); - plan.lambda().set(PlanEntity::getStatus, Integer.valueOf(PlanContants.PlanStatusEnum.FINISH_STATUS.getStatus())) - .in(PlanEntity::getStatus, Integer.valueOf(PlanContants.PlanStatusEnum.PAUSE_STATUS.getStatus()), Integer.valueOf(PlanContants.PlanStatusEnum.CHECK_STATUS.getStatus()), Integer.valueOf(PlanContants.PlanStatusEnum.UNDERWAY_STATUS.getStatus())) - .lt(PlanEntity::getEndTime, LocalDate.now()); - this.planService.update(plan); - //关闭超过计划结束时间的巡检任务 - UpdateWrapper task = new UpdateWrapper<>(); - task.lambda().set(TaskEntity::getStatus, Integer.valueOf(TaskContants.TaskStatusEnum.UNFINISH_STATUS.getStatus())) - .ne(TaskEntity::getStatus, Integer.valueOf(TaskContants.TaskStatusEnum.FINISH_STATUS.getStatus())) - .lt(TaskEntity::getPlanEndTime, LocalDate.now()); - this.update(task); - } - - /** - * 派发状态前置 : 已审核计划 且 已过计划开始时间 - */ - private void status() { - UpdateWrapper plan = new UpdateWrapper<>(); - plan.lambda().set(PlanEntity::getStatus, Integer.valueOf(PlanContants.PlanStatusEnum.UNDERWAY_STATUS.getStatus())) - .eq(PlanEntity::getStatus, Integer.valueOf(PlanContants.PlanStatusEnum.CHECK_STATUS.getStatus())) - .le(PlanEntity::getStartTime, LocalDate.now()); - this.planService.update(plan); - } - - /** - * 派发任务 - */ - private void distribute() { - // 查询需要派发任务列表 - List plans = planService.list(Wrappers.lambdaQuery() - .eq(PlanEntity::getStatus,Integer.valueOf(PlanContants.PlanStatusEnum.UNDERWAY_STATUS.getStatus()))); - if(CollectionUtil.isEmpty(plans)){ - return; - } - plans.forEach(plan->{ - if(PlanContants.PlanCycleEnum.NEVER_CYCLE.getCycle().equals(plan.getCycle())){//计划周期每次，只需要派发一次任务 - plan.setStatus(Integer.valueOf(PlanContants.PlanStatusEnum.FINISH_STATUS.getStatus())); - this.planService.updateById(plan); - } - if(PlanContants.PlanMethodEnum.SEIZE.getMethod().equals(plan.getMethod())){ - // 抢占模式 - this.seize(plan); - }else if(PlanContants.PlanMethodEnum.CONCURRENT.getMethod().equals(plan.getMethod())){ - // 并发模式 - this.concurrent(plan); - } - }); - } - - - /** - * 抢占模式 - * @param plan - */ - private void seize(PlanEntity plan) { - // 计划班次模式 - if("4".equals(plan.getType())){ - this.seizeClass(plan); - } - // 其他模式 - this.seizeOther(plan); - } - - /** - * 并发模式 - * @param plan - */ - private void concurrent(PlanEntity plan) { - // 计划班次模式 - if("4".equals(plan.getType())){ - this.concurrentClass(plan); - } - // 其他模式 - this.concurrentOther(plan); - } - - /** - * 抢占-班次模式 - * @param plan - */ - private void seizeClass(PlanEntity plan) { - List taskUserList = Lists.newArrayList(); - - if(Func.isEmpty(plan.getExecTimeJson())){ - XxlJobLogger.log("seizeClass_巡检计划未设置值班班次: plan = " + plan); - return; - } - JSONArray array = JSONArray.parseArray(plan.getExecTimeJson()); - for (int index = 0; index < plan.getTaskTimesADay(); index++) { - // 取巡检任务执行开始、结束时间、是否下一天 - JSONObject time = array.getJSONObject(index); - plan.setExecStartTime(time.get("execStartTime").toString()); - plan.setExecEndTime(time.get("execEndTime").toString()); - if(time.containsKey("isNextDay")){ - plan.setIsNextDay(time.getBoolean("isNextDay")); - } - // 保存巡检任务 - TaskEntity task = this.saveTask(plan,1); - if(ObjectUtil.isEmpty(task) || !time.containsKey("classId")){ - XxlJobLogger.log("seizeClass_任务执行时间json数据不包含classId"); - continue; - } - // 查询值班数据 - ImsDutyMainFeignVO main = dutyMainService.mainPerson(time.getLong("classId"), DateUtil.format(LocalDate.now(),DateUtil.PATTERN_DATE)); - if(ObjectUtil.isNotEmpty(main) && CollectionUtil.isNotEmpty(main.getPersons())){ - plan.setDutyId(main.getMainId()); - main.getPersons().forEach(persons->{ - // 任务用户关联记录 - TaskUserEntity taskUser = TaskUserEntity.builder().taskId(task.getId()).userId(persons).claimStatus(TaskContants.ClaimStatusEnum.UN_COLLECT.getStatus()).build(); - taskUser.setTenantId(plan.getTenantId()); - taskUserList.add(taskUser); - //添加到提醒cache - task.setUserId(persons); - remindCacheManager.addTaskToCacheList(task); - taskVideoManager.addTaskToVideoCacheList(task); - }); - } - String reason = this.saveTaskObject(plan,task); - if(reason.equals(StringUtils.EMPTY)){ - LocalDateTime now = LocalDateTime.now(); - reason = plan.getName() + now.getYear() + "年" + now.getMonthValue() + "月" + now.getDayOfMonth() + "日的任务派发成功"; - } - XxlJobLogger.log(reason); - TaskResultEntity taskResultEntity = TaskResultEntity.builder().planId(task.getPlanId()).batchNumber(task.getBatchNumber()).reason(reason).build(); - taskResultEntity.setTenantId(plan.getTenantId()); - taskResultService.save(taskResultEntity); - } - if(taskUserList.size()>0){ - taskUserService.saveBatch(taskUserList); - } - } - - - /** - * 抢占-其他模式 - * @param plan - */ - private void seizeOther(PlanEntity plan) { - List users = this.getUsersByPlan(plan); - List taskUserList = Lists.newArrayList(); - - JSONArray timeJsonArray = null; - if(Func.isNotEmpty(plan.getExecTimeJson())){ - timeJsonArray = JSON.parseArray(plan.getExecTimeJson()); - } - for (int j = 0; j < plan.getTaskTimesADay(); j++) { - if(Func.isNotEmpty(timeJsonArray)){ - JSONObject time = timeJsonArray.getJSONObject(j); - plan.setExecStartTime(time.get("execStartTime").toString()); - plan.setExecEndTime(time.get("execEndTime").toString()); - if(time.containsKey("isNextDay")){ - plan.setIsNextDay(time.getBoolean("isNextDay")); - } - } else { - plan.setExecStartTime("00:00:00"); - plan.setExecEndTime("23:59:59"); - } - TaskEntity task = this.saveTask(plan,1); - if(task==null){continue;} - for(PlanUserEntity user:users){ - TaskUserEntity taskUser = TaskUserEntity.builder().taskId(task.getId()).userId(user.getUserId()).claimStatus(TaskContants.ClaimStatusEnum.UN_COLLECT.getStatus()).build(); - taskUser.setTenantId(plan.getTenantId()); - taskUserList.add(taskUser); - //添加到提醒cache - task.setUserId(user.getUserId()); - remindCacheManager.addTaskToCacheList(task); - taskVideoManager.addTaskToVideoCacheList(task); - } - String reason = this.saveTaskObject(plan,task); - if(reason.equals(StringUtils.EMPTY)){ - LocalDateTime now = LocalDateTime.now(); - reason = plan.getName() + now.getYear() + "年" + now.getMonthValue() + "月" + now.getDayOfMonth() + "日的任务派发成功"; - } - XxlJobLogger.log(reason); - TaskResultEntity taskResultEntity = TaskResultEntity.builder().planId(task.getPlanId()).batchNumber(task.getBatchNumber()).reason(reason).build(); - taskResultEntity.setTenantId(plan.getTenantId()); - taskResultService.save(taskResultEntity); - } - - if(taskUserList.size()>0){ - taskUserService.saveBatch(taskUserList); - } else { - XxlJobLogger.log("没有用户: plan = " + plan); - XxlJobLogger.log("SeizeTaskService...没有任务用户: plan = " + plan); - } - } - - - /** - * 并发-班次模式 - * @param plan - */ - private void concurrentClass(PlanEntity plan) { - List taskUserList = Lists.newArrayList(); - - LocalDateTime now = LocalDateTime.now(); - String defaultReason = plan.getName() + now.getYear() + "年" + now.getMonthValue() + "月" + now.getDayOfMonth() + "日的任务派发成功"; - JSONArray timeJsonArray; - if (Func.isNotEmpty(plan.getExecTimeJson())) { - timeJsonArray = JSON.parseArray(plan.getExecTimeJson()); - } else { - XxlJobLogger.log("巡检计划未设置值班班次: plan = " + plan); - return; - } - for (int j = 0; j < plan.getTaskTimesADay(); j++) { - JSONObject time = timeJsonArray.getJSONObject(j); - plan.setExecStartTime(time.get("execStartTime").toString()); - plan.setExecEndTime(time.get("execEndTime").toString()); - if (time.containsKey("isNextDay")) { - plan.setIsNextDay(time.getBoolean("isNextDay")); - } - - //获取值班用户 - if (time.containsKey("classId")) { - Long classId = time.getLong("classId"); - DateTimeFormatter dfShort = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - ImsDutyMainFeignVO mainPerson = dutyMainService.mainPerson(classId, dfShort.format(LocalDate.now())); - List ids = mainPerson.getPersons(); - plan.setDutyId(mainPerson.getMainId()); - if (Func.isNotEmpty(ids)) { - for (Long id : ids) { - TaskEntity task = saveTask(plan, ids.size()); - if (task == null) { - continue; - } - TaskUserEntity taskUser = TaskUserEntity.builder().taskId(task.getId()).userId(id).claimStatus(TaskContants.ClaimStatusEnum.UN_COLLECT.getStatus()).build(); - taskUser.setTenantId(plan.getTenantId()); - taskUserList.add(taskUser); - String reason = saveTaskObject(plan, task); - if (reason.equals(StringUtils.EMPTY)) { - reason = defaultReason; - } - - XxlJobLogger.log(reason); - TaskResultEntity taskResultEntity = TaskResultEntity.builder().planId(task.getPlanId()).batchNumber(task.getBatchNumber()).reason(reason).build(); - taskResultEntity.setTenantId(plan.getTenantId()); - taskResultService.save(taskResultEntity); - - //添加到提醒cache - task.setUserId(id); - remindCacheManager.addTaskToCacheList(task); - taskVideoManager.addTaskToVideoCacheList(task); - } - } else { - XxlJobLogger.log("获取该班次值班人员为空, plan = " + plan); - return; - } - } else { - XxlJobLogger.log("巡检计划未设置值班班次, plan = " + plan); - return; - } - } - if (taskUserList.size() > 0) { - taskUserService.saveBatch(taskUserList); - } - } - - /** - * 并发其他模式 - * @param plan - */ - private void concurrentOther(PlanEntity plan) { - LocalDateTime now = LocalDateTime.now(); - String defaultReason = plan.getName() + now.getYear() + "年" + now.getMonthValue() + "月" + now.getDayOfMonth() + "日的任务派发成功"; - List users = this.getUsersByPlan(plan); - List taskUserList = Lists.newArrayList(); - - JSONArray timeJsonArray = null; - if (Func.isNotEmpty(plan.getExecTimeJson())) { - timeJsonArray = JSON.parseArray(plan.getExecTimeJson()); - } - for (PlanUserEntity user : users) { - for (int j = 0; j < plan.getTaskTimesADay(); j++) { - if (Func.isNotEmpty(timeJsonArray)) { - JSONObject time = timeJsonArray.getJSONObject(j); - plan.setExecStartTime(time.get("execStartTime").toString()); - plan.setExecEndTime(time.get("execEndTime").toString()); - if (time.containsKey("isNextDay")) { - plan.setIsNextDay(time.getBoolean("isNextDay")); - } - } else { - plan.setExecStartTime("00:00:00"); - plan.setExecEndTime("23:59:59"); - } - TaskEntity task = saveTask(plan, users.size()); - if (task == null) { - continue; - } - TaskUserEntity taskUser = TaskUserEntity.builder().taskId(task.getId()).userId(user.getId()).claimStatus(TaskContants.ClaimStatusEnum.UN_COLLECT.getStatus()).build(); - taskUser.setTenantId(plan.getTenantId()); - taskUserList.add(taskUser); - String reason = saveTaskObject(plan, task); - if (reason.equals(StringUtils.EMPTY)) { - reason = defaultReason; - } - XxlJobLogger.log(reason); - - TaskResultEntity taskResultEntity = TaskResultEntity.builder().planId(task.getPlanId()).batchNumber(task.getBatchNumber()).reason(reason).build(); - taskResultEntity.setTenantId(plan.getTenantId()); - taskResultService.save(taskResultEntity); - - //添加到提醒cache - task.setUserId(user.getUserId()); - remindCacheManager.addTaskToCacheList(task); - taskVideoManager.addTaskToVideoCacheList(task); - } - } - if (taskUserList.size() > 0) { - taskUserService.saveBatch(taskUserList); - } else { - log.error("ConcurrentTaskServcie...没有任务用户: plan = " + plan); - XxlJobLogger.log("ConcurrentTaskServcie...没有任务用户: plan = " + plan); - } - } - - /** - * 根据巡检计划返回与计划有关的所有用户 - * @param plan 巡检计划实例 - * @return 计划相关用户集合 - */ - public List getUsersByPlan(PlanEntity plan) { - List res = new LinkedList<>(); - if(PlanContants.PlanTypeEnum.USER_TYPE.getType().equals(plan.getType()) || PlanContants.PlanTypeEnum.FREE_TYPE.getType().equals(plan.getType())){ - QueryWrapper planUserQw = new QueryWrapper<>(); - planUserQw.lambda().eq(PlanUserEntity::getPlanId, plan.getId()); - res.addAll(planUserService.list(planUserQw)); - }else if(PlanContants.PlanTypeEnum.POSITION_TYPE.getType().equals(plan.getType())){ - QueryWrapper planPositionEntityQueryWrapper = new QueryWrapper<>(); - planPositionEntityQueryWrapper.lambda().eq(PlanPositionEntity::getPlanId, plan.getId()); - planPostionService.list(planPositionEntityQueryWrapper).forEach(entity->{ - //获取该机构下所有用户列表 - List users = new ArrayList<>(); - List positionUsers = userClient.userListByPosition(entity.getPositionId()).getData(); - if(CollectionUtil.isNotEmpty(positionUsers)){ - users = positionUsers.stream().filter(user->user.getCreateDept().toString().contains(entity.getCreateDept().toString())).collect(Collectors.toList()); - } - XxlJobLogger.log("岗位信息：" + entity + "; 获取到的user:{}",users.stream().map(User::getName).collect(Collectors.joining(","))); - for(User u:users){ - res.add(PlanUserEntity.builder().planId(plan.getId()).userId(u.getId()).build()); - } - }); - }else if(PlanContants.PlanTypeEnum.ORG_TYPE.getType().equals(plan.getType())){ - QueryWrapper planOrgEntityQueryWrapper = new QueryWrapper<>(); - planOrgEntityQueryWrapper.lambda().eq(PlanOrgEntity::getPlanId, plan.getId()); - planOrgService.list(planOrgEntityQueryWrapper).forEach(entity->{ - List users = userClient.userListByDeptId(entity.getOrgId()).getData(); - for(User u:users){ - res.add(PlanUserEntity.builder().planId(plan.getId()).userId(u.getId()).build()); - } - }); - }else if(PlanContants.PlanTypeEnum.CLASS_TYPE.getType().equals(plan.getType())){ - XxlJobLogger.log("巡检计划为班次时，有单独的处理流程，不应该跑到该分支下面来, plan = " + plan); - JSONArray timeJsonArray; - if(Func.isNotEmpty(plan.getExecTimeJson())){ - timeJsonArray = JSON.parseArray(plan.getExecTimeJson()); - } - else{ - throw new ServiceException("巡检计划未设置值班班次: plan = " + plan); - } - for(int i=0;i ids = mainPerson.getPersons(); - log.info("--计划为：{}；人员ID为：{}--",plan.getName(),ids.stream().map(String::valueOf).collect(Collectors.joining(","))); - plan.setDutyId(mainPerson.getMainId()); - if(Func.isNotEmpty(ids)){ - for (Long id : ids) { - res.add(PlanUserEntity.builder().planId(plan.getId()).userId(id).build()); - } - } else { - XxlJobLogger.log("获取该班次值班人员为空, plan = " + plan); - } - } - } - } - //设置租户 - return res.stream().distinct().peek(entity-> entity.setTenantId(plan.getTenantId())).collect(Collectors.toList()); - } - - /** - * 保存巡检任务 - * @param plan 巡检计划 - * @param totalTaskNum 任务数 : 抢占任务只生成一个 - * @return 巡检任务实例 - */ - public TaskEntity saveTask(PlanEntity plan,int totalTaskNum) { - totalTaskNum = plan.getTaskTimesADay() * totalTaskNum; - TaskEntity task = new TaskEntity(); - LocalDate now = LocalDate.now(); - DateTimeFormatter dfShort = DateTimeFormatter.ofPattern("yyyy-MM-dd "); - DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - - if(PlanContants.PlanCycleEnum.NEVER_CYCLE.getCycle().equals(plan.getCycle())) { - task.setBatchNumber(now.getYear()+ "_" +now.getMonthValue()+ "_" +now.getDayOfMonth() + "N"); - task.setPlanEndTime(LocalDateTime.parse(dfShort.format(plan.getEndTime())+plan.getExecEndTime(), df)); - }else if(PlanContants.PlanCycleEnum.EVERYDAY_CYCLE.getCycle().equals(plan.getCycle())) { - task.setBatchNumber(now.getYear()+ "_" +now.getMonthValue()+ "_" +now.getDayOfMonth()); - if(Func.isNotEmpty(plan.getIsNextDay()) && plan.getIsNextDay()){ - task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now.plusDays(1L)) + plan.getExecEndTime(), df)); - } else { - task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now) + plan.getExecEndTime(), df)); - } - }else if(PlanContants.PlanCycleEnum.EVERYWEEK_CYCLE.getCycle().equals(plan.getCycle())) { - WeekFields weekFields = WeekFields.of(DayOfWeek.MONDAY,1); - int weeks = now.get(weekFields.weekOfYear()); - task.setBatchNumber(now.getYear()+ "_" +now.getMonthValue() + "_" +weeks + "W"); - task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now.plusWeeks(1)) + plan.getExecEndTime(), df)); - }else if(PlanContants.PlanCycleEnum.EVERYMONTH_CYCLE.getCycle().equals(plan.getCycle())) { - task.setBatchNumber(now.getYear()+ "_" +now.getMonthValue()); - task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now.plusMonths(1))+plan.getExecEndTime(), df)); - }else if(PlanContants.PlanCycleEnum.EVERYQUARTER_CYCLE.getCycle().equals(plan.getCycle())) { - task.setBatchNumber(now.getYear()+ "_" +now.getMonthValue() + "Q"); - task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now.plusMonths(3)) + plan.getExecEndTime(), df)); - }else if(PlanContants.PlanCycleEnum.EVERYYEAR_CYCLE.getCycle().equals(plan.getCycle())){ - task.setBatchNumber(String.valueOf(now.getYear())); - task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now.plusYears(1))+plan.getExecEndTime(), df)); - } - if(PlanContants.PlanCycleEnum.NEVER_CYCLE.getCycle().equals(plan.getCycle())) { - task.setPlanStartTime(LocalDateTime.parse(dfShort.format(plan.getStartTime()) + plan.getExecStartTime(), df)); - } else { - task.setPlanStartTime(LocalDateTime.parse(dfShort.format(now) + plan.getExecStartTime(), df)); - } - task.setDutyId(plan.getDutyId()); - task.setPlanId(plan.getId()); - task.setPlanName(plan.getName()); - task.setType(plan.getType()); - task.setCycle(plan.getCycle()); - task.setStatus(Integer.valueOf(TaskContants.TaskStatusEnum.INIT_STATUS.getStatus())); - task.setTenantId(plan.getTenantId()); - task.setCreateUser(plan.getCreateUser()); - task.setCreateDept(plan.getCreateDept()); - task.setAutoVideo(plan.getAutoVideo()); - task.setMessageTemplateId(plan.getMessageTemplateId()); - task.setMethod(plan.getMethod()); - task.setEndRemindFlag(true); - task.setStartRemindFlag(true); - task.setStartRemindTime(task.getPlanStartTime().minusMinutes(plan.getStartRemind())); - task.setEndRemindTime(task.getPlanEndTime().minusMinutes(plan.getEndRemind())); - int taskCount = this.count(Wrappers.query().lambda().eq(TaskEntity::getPlanId,task.getPlanId()).eq(TaskEntity::getBatchNumber, task.getBatchNumber())); - XxlJobLogger.log("该计划已生成计划批次：{},数量：{}",task.getBatchNumber(),taskCount); - if(taskCount >= totalTaskNum){ - log.info("计划id={}本周期batchNumber={}的任务已生成",plan.getId(),task.getBatchNumber()); - return null; - } - this.save(task); - return task; - } - - /** - * 保存巡检对象数据 - * @param plan 巡检计划实例 - * @param task 巡检任务实例 - * @return - */ - public String saveTaskObject(PlanEntity plan, TaskEntity task) { - String result = StringUtils.EMPTY; - List taskObjectList = Lists.newArrayList(); - // 自由模式 - if(PlanContants.PlanTypeEnum.FREE_TYPE.getType().equals(plan.getType())){ - // 查询计划用户 - List planUsers = planUserService.list(Wrappers.query().lambda().eq(PlanUserEntity::getPlanId,plan.getId())); - if(CollectionUtil.isEmpty(planUsers)){ - return result; - } - for(PlanUserEntity planUser : planUsers){ - // 查询巡检对象用户 - List objectUsers= objectUserService.list(Wrappers.query().lambda().eq(ObjectUserEntity::getUserId,planUser.getUserId())); - if(CollectionUtil.isEmpty(objectUsers)){ - break; - } - for (ObjectUserEntity objectUser : objectUsers){ - List existEntity = taskObjectList.stream().filter(taskObjectEntity -> objectUser.getObjectId().equals(taskObjectEntity.getObjectId())).collect(Collectors.toList()); - if(ObjectUtil.isNotEmpty(existEntity)){ - break; - } - // 保存巡检对象 - result = saveTaskObject(taskObjectList,task,objectUser.getObjectId(),objectUser.getTemplateId()); - if(!result.equals(StringUtils.EMPTY)){ - break; - } - } - } - }else{ - List templates = planObjectTemplateService.list(Wrappers.query().lambda().eq(PlanObjectTemplateEntity::getPlanId,plan.getId())); - for (PlanObjectTemplateEntity template : templates) { - result = saveTaskObject(taskObjectList,task,template.getObjectId(),template.getTemplateId()); - if(!result.equals(StringUtils.EMPTY)){ - break; - } - } - } - if(taskObjectList.size()>0 && result.equals(StringUtils.EMPTY)){ - taskObjectService.saveBatch(taskObjectList); - } - return result; - } - - /** - * 保存巡检对象 - * @param taskObjectList - * @param task - * @param objectId - * @param templateId - * @return - */ - private String saveTaskObject(List taskObjectList,TaskEntity task,Long objectId,Long templateId){ - String result = StringUtils.EMPTY; - ObjectEntity io = objectService.getById(objectId); - if(io == null) { - return "巡检对象id="+objectId+"找不到记录"; - } - TemplateEntity templateInfo = templateService.getById(templateId); - if(templateInfo == null) { - return "巡检模板id="+templateId+"找不到记录"; - } - TaskObjectEntity ito = new TaskObjectEntity(); - ito.setTaskId(task.getId()); - ito.setObjectId(objectId); - ito.setCode(io.getCode()); - ito.setName(io.getName()); - ito.setAddress(io.getAddress()); - ito.setLttd(io.getLttd()); - ito.setLgtd(io.getLgtd()); - ito.setCreateUser(task.getCreateUser()); - ito.setCreateDept(task.getCreateDept()); - ito.setCreateTime(task.getCreateTime()); - ito.setDuplicateRecord(templateInfo.getDuplicateRecord()); - ito.setTenantId(task.getTenantId()); - ito.setStatus(TaskContants.StatusEnum.INIT_STATUS.getStatus()); - taskObjectList.add(ito); - List projects = templateProjectService.list(Wrappers.query().lambda().eq(TemplateProjectEntity::getTemplateId,templateId)); - for (TemplateProjectEntity project : projects) { - result = saveTaskObjectProject(task, objectId, project); - if(!result.equals(StringUtils.EMPTY)){ - break; - } - } - return result; - } - - /** - * 从巡检任务、巡检计划对象模板、巡检模板项目获取信息插入巡检任务项目表以及对应的历史数据表 - * @param objectId 巡检计划对象模板实例 - * @param project 巡检模板项目实例 - * @return - */ - private String saveTaskObjectProject(TaskEntity task, Long objectId, TemplateProjectEntity project) { - String result = StringUtils.EMPTY; - ProjectEntity ip = projectService.getById(project.getProjectId()); - if(ip == null) { - return "巡检项目id="+project.getProjectId()+"找不到记录"; - } - TaskObjectProjectEntity itop = new TaskObjectProjectEntity(); - itop.setObjectId(objectId); - itop.setProjectId(ip.getId()); - itop.setTaskId(task.getId()); - itop.setName(ip.getName()); - itop.setCode(ip.getCode()); - itop.setDescription(ip.getDescription()); - itop.setCreateTime(project.getCreateTime()); - itop.setTenantId(task.getTenantId()); - itop.setCreateUser(task.getCreateUser()); - itop.setCreateDept(task.getCreateDept()); - itop.setStatus(TaskContants.StatusEnum.INIT_STATUS.getStatus()); - taskObjectProjectService.save(itop); - List contents = projectContentService.list(Wrappers.query().lambda().eq(ProjectContentEntity::getProjectId,project.getProjectId())); - for (ProjectContentEntity content : contents) { - result = saveTaskObjectProjectContent(task, objectId, content); - if(!result.equals(StringUtils.EMPTY)){ - break; - } - } - return result; - } - - /** - * 从巡检任务、巡检计划对象模板、巡检项目内容获取信息插入巡检任务内容表以及对应的历史数据表 - * @param objectId 巡检计划对象模板实例 - * @param content 巡检项目内容实例 - * @return - */ - private String saveTaskObjectProjectContent(TaskEntity task, Long objectId, ProjectContentEntity content) { - ContentEntity ioc = contentService.getById(content.getContentId()); - if(ioc == null) {return "巡检内容id="+content.getContentId()+"找不到记录";} - TaskObjectProjectContentEntity itopc = new TaskObjectProjectContentEntity(); - itopc.setTaskId(task.getId()); - itopc.setObjectId(objectId); - itopc.setProjectId(content.getProjectId()); - itopc.setContentId(content.getContentId()); - itopc.setCode(ioc.getCode()); - itopc.setName(ioc.getName()); - itopc.setDescription(ioc.getDescription()); - itopc.setCheckType(ioc.getCheckType()); - itopc.setRecordType(ioc.getRecordType()); - itopc.setCreateTime(content.getCreateTime()); - itopc.setTenantId(task.getTenantId()); - itopc.setCreateUser(task.getCreateUser()); - itopc.setCreateDept(task.getCreateDept()); - itopc.setCheckTypeSon(ioc.getCheckTypeSon()); - itopc.setCameraAddr(ioc.getCameraAddr()); - itopc.setCameraId(ioc.getCameraId()); - itopc.setClockId(ioc.getClockId()); - itopc.setOtherParam(ioc.getOtherParam()); - itopc.setStatus(TaskContants.StatusEnum.INIT_STATUS.getStatus()); - itopc.setDictType(ioc.getDictType()); - taskObjectProjectContentService.save(itopc); - return StringUtils.EMPTY; - } - /** * 时间区间机构的巡检任务数据查询 * @param start @@ -758,13 +49,13 @@ public class TaskServiceImpl extends BaseServiceImpl imp task.setInspectTaskIds(tasks.stream().map(TaskEntity::getId).map(Object::toString).collect(Collectors.joining(","))); task.setInspectTaskSum(tasks.size()); // 所有处理完成巡检任务 - List finshList = tasks.stream().filter(o-> null != o.getStatus() && o.getStatus().equals(3)).collect(Collectors.toList()); + List finshList = tasks.stream().filter(o-> null != o.getStatus() && o.getStatus().equals(4)).collect(Collectors.toList()); if(CollectionUtil.isEmpty(finshList)){ return task; } task.setInspectTaskFinish(finshList.size()); // 未执行任务数 - List notExecuteList = tasks.stream().filter(o-> null != o.getStatus() && o.getStatus().equals(0)).collect(Collectors.toList()); + List notExecuteList = tasks.stream().filter(o-> !finshList.stream().map(TaskEntity::getId).collect(Collectors.toList()).contains(o.getId())).collect(Collectors.toList()); if(CollectionUtil.isEmpty(notExecuteList)){ return task; } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskUserServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskUserServiceImpl.java deleted file mode 100644 index baf26c8..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskUserServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.TaskUserMapper; -import com.hnac.hzims.scheduled.service.inspect.TaskUserService; -import com.hnac.hzinfo.inspect.task.entity.TaskUserEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class TaskUserServiceImpl extends BaseServiceImpl implements TaskUserService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateProjectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateProjectServiceImpl.java deleted file mode 100644 index f970386..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateProjectServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.TemplateProjectMapper; -import com.hnac.hzims.scheduled.service.inspect.TemplateProjectService; -import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class TemplateProjectServiceImpl extends BaseServiceImpl implements TemplateProjectService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateServiceImpl.java deleted file mode 100644 index f4b5b41..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.TemplateMapper; -import com.hnac.hzims.scheduled.service.inspect.TemplateService; -import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class TemplateServiceImpl extends BaseServiceImpl implements TemplateService { -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DefectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DefectService.java index fd9ebce..73fbb5f 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DefectService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DefectService.java @@ -11,5 +11,4 @@ import java.util.List; */ public interface DefectService extends BaseService { - SolveHomeVO solve_count(List deptIds, String start, String end); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenanceService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenanceService.java index 2e2de53..963d895 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenanceService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenanceService.java @@ -13,8 +13,6 @@ import java.util.List; */ public interface MaintenanceService extends BaseService { - void maintenanceTaskDistribute(String param); - Integer maintenanceCount(List areas); MaintainVo maintain(String start, String end, List areas); diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/PhenomenonService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/PhenomenonService.java index 26a354e..4cc1312 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/PhenomenonService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/PhenomenonService.java @@ -1,6 +1,7 @@ package com.hnac.hzims.scheduled.service.operation.business; import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; +import com.hnac.hzims.operational.defect.vo.SolveHomeVO; import com.hnac.hzims.operational.main.vo.ShortagesVo; import com.hnac.hzims.operational.report.vo.DutyDefectVO; import org.springblade.core.mp.base.BaseService; @@ -12,6 +13,8 @@ import java.util.List; */ public interface PhenomenonService extends BaseService { + SolveHomeVO solve_count(List deptIds, String start, String end); + DutyDefectVO defect(String start, String end, List areas); ShortagesVo defectMonth(String start, String end, List list); diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DefectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DefectServiceImpl.java index 1103e13..9efd2c3 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DefectServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DefectServiceImpl.java @@ -26,28 +26,4 @@ import java.util.stream.Collectors; @AllArgsConstructor public class DefectServiceImpl extends BaseServiceImpl implements DefectService { - /** - * 消缺数量统计 - * @param deptIds - * @param start - * @param end - * @return - */ - @Override - public SolveHomeVO solve_count(List deptIds, String start, String end) { - SolveHomeVO solve = new SolveHomeVO(); - List defects = this.list(Wrappers.lambdaQuery() - .in(OperDefectEntity::getCreateDept,deptIds) - .gt(OperDefectEntity::getCreateTime,start) - .lt(OperDefectEntity::getCreateTime,end) - ); - if(cn.hutool.core.collection.CollectionUtil.isEmpty(defects)){ - solve.setDefectCount(0); - solve.setSolveCount(0); - }else{ - solve.setDefectCount(defects.size()); - solve.setSolveCount((int) defects.stream().filter(defect-> ObjectUtil.isNotEmpty(defect.getHandleTaskId())).count()); - } - return solve; - } } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java index ba446b0..fd7c052 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java @@ -1,44 +1,23 @@ package com.hnac.hzims.scheduled.service.operation.business.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hnac.hzims.message.dto.PlanMsgRecordDto; -import com.hnac.hzims.message.entity.config.MessageTemplateEntity; -import com.hnac.hzims.message.fegin.IMessageClient; -import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity; import com.hnac.hzims.operational.main.vo.MaintainVo; import com.hnac.hzims.operational.main.vo.RegularWorkVO; -import com.hnac.hzims.operational.maintenance.constants.MaintenanceConstant; -import com.hnac.hzims.operational.maintenance.entity.OperMaintenancePlanEntity; import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity; -import com.hnac.hzims.operational.maintenance.vo.OperMaintenanceTaskEntityVo; import com.hnac.hzims.scheduled.mapper.operation.MaintenanceMapper; -import com.hnac.hzims.scheduled.service.operation.business.MaintenancePlanService; import com.hnac.hzims.scheduled.service.operation.business.MaintenanceService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.*; -import org.springblade.flow.core.feign.IFlowClient; -import org.springframework.beans.BeanUtils; -import org.springframework.jdbc.datasource.DataSourceTransactionManager; +import org.springblade.core.tool.utils.CollectionUtil; import org.springframework.stereotype.Service; -import org.springframework.transaction.TransactionDefinition; -import org.springframework.transaction.TransactionStatus; -import org.springframework.transaction.support.DefaultTransactionDefinition; -import java.beans.Transient; -import java.time.*; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ThreadPoolExecutor; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.Date; +import java.util.List; import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static org.springblade.core.tool.utils.DateUtil.PATTERN_DATE; /** * @author ysj @@ -48,157 +27,6 @@ import static org.springblade.core.tool.utils.DateUtil.PATTERN_DATE; @Slf4j public class MaintenanceServiceImpl extends BaseServiceImpl implements MaintenanceService { - private final MaintenancePlanService planService; - - private final DutyMainServiceImpl dutyMainService; - - private final IFlowClient flowClient; - - private final IMessageClient messageClient; - - private final DataSourceTransactionManager manager; - - private final ThreadPoolExecutor executor; - - /** - * 日常维护任务派发 - * @param param - */ - @Override - @Transient - public void maintenanceTaskDistribute(String param) { - // 开始时间 - Date start = DateUtil.parse(DateUtil.formatDate(DateUtil.now()), DateUtil.PATTERN_DATE); - // 结束时间 - Date end = DateUtil.parse(DateUtil.formatDate(DateUtil.plusDays(start, 1)), DateUtil.PATTERN_DATE); - // 查询日常维护计划 - List plans = planService.list(Wrappers.lambdaQuery() - .ge(OperMaintenancePlanEntity::getDisposeTime,start) - .lt(OperMaintenancePlanEntity::getDisposeTime,end) - .isNotNull(OperMaintenancePlanEntity::getCreateTaskTime) - ); - // 遍历计划列表生成相应任务 - if(CollectionUtil.isEmpty(plans)){ - return; - } - plans.forEach(plan -> { - // 生成日常任务对象 - OperMaintenanceTaskEntity task = BeanUtil.copy(plan,OperMaintenanceTaskEntity.class); - if(StringUtil.isEmpty(task.getEmCode())){ - this.taskDistribute(task,plan); - }else{ - for (String code : plan.getEmCode().split(",")) { - task.setEmCode(code); - this.taskDistribute(task,plan); - } - } - }); - } - - /** - * 日常维护任务派发 - * @param task - * @param plan - */ - private void taskDistribute(OperMaintenanceTaskEntity task, OperMaintenancePlanEntity plan) { - DefaultTransactionDefinition defaultTransactionDefinition = new DefaultTransactionDefinition(); - defaultTransactionDefinition.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); - TransactionStatus transaction = manager.getTransaction(defaultTransactionDefinition); - task.setId(null); - task.setCreateTime(new Date()); - task.setUpdateTime(new Date()); - task.setPlanId(plan.getId()); - task.setTaskCode(UUID.randomUUID().toString()); - if (task.getRefLibraryId() != 0) { - task.setCreateTime(DateUtil.now()); - } - if(ObjectUtil.isNotEmpty(plan.getDisposer())){ - task.setDisposer(plan.getDisposer().toString()); - } - //补充计划结束时间 - Instant instant = task.getDisposeTime().toInstant(); - ZoneId zoneId = ZoneId.systemDefault(); - LocalDateTime disposeTime = instant.atZone(zoneId).toLocalDateTime(); - task.setPlanEndTime(disposeTime.plusHours(task.getHours())); - //获取值班人员 - if (ObjectUtil.isNotEmpty(plan.getMaintenanceModel()) && plan.getMaintenanceModel() == 2) { - //查询值班信息 - LambdaQueryWrapper dutyWrapper = new LambdaQueryWrapper<>(); - dutyWrapper.eq(ImsDutyMainEntity::getDutyDate, DateTimeFormatter.ofPattern(PATTERN_DATE).format(disposeTime)); - dutyWrapper.eq(ImsDutyMainEntity::getClassId, plan.getImsDutyClassId()); - ImsDutyMainEntity entity = dutyMainService.getOne(dutyWrapper); - if (ObjectUtil.isEmpty(entity) || StringUtils.isEmpty(entity.getDutyPersonIds())) { - log.error("计划ID为：{}未查询到排班记录", plan.getId()); - return; - } - String userId = entity.getDutyPersonIds(); - task.setDisposer(userId.replaceAll("\\^", ",")); - } - this.save(task); - // 事务提交 - manager.commit(transaction); - //启动流程 - String processInstanceId = this.startProcess(plan.getProcDefId(), task); - //推送消息 - CompletableFuture operMaintenanceTaskEntityCompletableFuture = - CompletableFuture.runAsync(() -> { - task.setProcessInstanceId(processInstanceId); - this.updateById(task); - plan.setCreateTaskTime(new Date()); - planService.updateById(plan); - //推送消息 - this.pushTaskMessage(task.getId()); - }, executor); - //启动队列 - try { - CompletableFuture.allOf(operMaintenanceTaskEntityCompletableFuture).get(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 开启一个流程实例 - **/ - private String startProcess(String processDefinitionKey, OperMaintenanceTaskEntity taskEntity) { - OperMaintenanceTaskEntityVo operMaintenanceTaskEntityVo = new OperMaintenanceTaskEntityVo(); - BeanUtils.copyProperties(taskEntity, operMaintenanceTaskEntityVo); - Map params = new HashMap<>(); - params.put("taskId", taskEntity.getId()); - List userIdList = Stream.of(taskEntity.getDisposer().split(",")).collect(Collectors.toList()); - String taskUsers = userIdList.stream().filter(StringUtils::isNotBlank).map("taskUser_"::concat).collect(Collectors.joining(",")); - params.put("initUserIds", taskUsers); - params.put("operMaintenanceTaskEntityVo", operMaintenanceTaskEntityVo); - return flowClient.startProcessInstanceContainNameByKey(processDefinitionKey, String.valueOf(taskEntity.getId()), taskEntity.getTitle(), params).getData().getProcessInstanceId(); - } - - /** - * 推送消息 - */ - private void pushTaskMessage(Long taskId) { - OperMaintenanceTaskEntity task = this.getById(taskId); - if(ObjectUtil.isEmpty(task)){ - return; - } - // 根据消息模板Id查询模板 - R result = messageClient.getMsgTemplateById(task.getMessageTemplateId()); - if (result.isSuccess() && ObjectUtil.isNotEmpty(result.getData())) { - Func.toLongList(",", task.getDisposer()).forEach(userId -> { - //推送消息 - ZoneId zoneId = ZoneId.systemDefault(); - PlanMsgRecordDto msg = new PlanMsgRecordDto(); - msg.setTemplateId(task.getMessageTemplateId()); - msg.setCreateUser(task.getCreateUser()); - msg.setPlanTime(LocalDateTime.ofInstant(task.getDisposeTime().toInstant(), zoneId)); - msg.setTaskId(task.getId()); - msg.setDeptId(task.getCreateDept()); - msg.setReceiver(userId); - msg.setContent("距离任务执行时间已不满一小时，请及时处理"); - messageClient.planSendMessage(msg); - }); - } - } - /** * 获取日常维护数量 * @param departList @@ -247,7 +75,7 @@ public class MaintenanceServiceImpl extends BaseServiceImpl maintainFinish = maintainList.stream().filter(o-> Func.isNotEmpty(o.getStatus()) && MaintenanceConstant.TASK_STATUS_5 == o.getStatus()) + List maintainFinish = maintainList.stream().filter(o-> "结束".equals(o.getFlowTaskName())) .map(OperMaintenanceTaskEntity::getId).collect(Collectors.toList()); if(CollectionUtil.isEmpty(maintainFinish)){ maintainVo.setMaintainFinish(0); @@ -281,7 +109,7 @@ public class MaintenanceServiceImpl extends BaseServiceImpl regularWorkFinishList = regularWorkList.stream().filter(o -> MaintenanceConstant.TASK_STATUS_5 == o.getStatus()).collect(Collectors.toList()); + List regularWorkFinishList = regularWorkList.stream().filter(o -> "结束".equals(o.getFlowTaskName())).collect(Collectors.toList()); if (CollectionUtil.isEmpty(regularWorkFinishList)) { regularWorkVO.setRegularWork(0); return regularWorkVO; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/PhenomenonServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/PhenomenonServiceImpl.java index 1dc8019..9cfa208 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/PhenomenonServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/PhenomenonServiceImpl.java @@ -1,7 +1,10 @@ package com.hnac.hzims.scheduled.service.operation.business.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hnac.hzims.operational.defect.entity.OperDefectEntity; import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; +import com.hnac.hzims.operational.defect.vo.SolveHomeVO; import com.hnac.hzims.operational.main.vo.ShortagesVo; import com.hnac.hzims.operational.report.vo.DutyDefectVO; import com.hnac.hzims.scheduled.mapper.operation.PhenomenonMapper; @@ -11,6 +14,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.stereotype.Service; import java.time.LocalDate; @@ -28,6 +32,32 @@ import java.util.stream.Collectors; public class PhenomenonServiceImpl extends BaseServiceImpl implements PhenomenonService { /** + * 消缺数量统计 + * @param deptIds + * @param start + * @param end + * @return + */ + @Override + public SolveHomeVO solve_count(List deptIds, String start, String end) { + SolveHomeVO solve = new SolveHomeVO(); + List defects = this.list(Wrappers.lambdaQuery() + .in(OperPhenomenonEntity::getCreateDept,deptIds) + .gt(OperPhenomenonEntity::getCreateTime,start) + .lt(OperPhenomenonEntity::getCreateTime,end) + ); + if(cn.hutool.core.collection.CollectionUtil.isEmpty(defects)){ + solve.setDefectCount(0); + solve.setSolveCount(0); + }else{ + solve.setDefectCount(defects.size()); + solve.setSolveCount((int) defects.stream().filter(defect-> !ObjectUtil.isEmpty(defect.getHandleTaskId())).count()); + } + return solve; + } + + + /** * 时间范围内机构缺陷数据查询 * @param start * @param end @@ -51,7 +81,7 @@ public class PhenomenonServiceImpl extends BaseServiceImplString.valueOf(o.getId())).collect(Collectors.joining(","))); defectVO.setDefectSum(operPhenomenonList.size()); // 消缺数 - List defectList = operPhenomenonList.stream().filter(o -> (Func.isNotEmpty(o.getIsDefect()) && o.getIsDefect() == 0) || "1".equals(o.getConclusionStatus())). + List defectList = operPhenomenonList.stream().filter(defect-> !ObjectUtil.isEmpty(defect.getHandleTaskId())). map(OperPhenomenonEntity::getId).collect(Collectors.toList()); if(CollectionUtil.isEmpty(defectList)){ defectVO.setDefect(0); @@ -88,8 +118,7 @@ public class PhenomenonServiceImpl extends BaseServiceImpl shortagesList = defects.stream().filter(o -> (Func.isNotEmpty(o.getIsDefect()) && o.getIsDefect() == 0) || "1".equals(o.getConclusionStatus())). - map(OperPhenomenonEntity::getId).collect(Collectors.toList()); + List shortagesList = defects.stream().filter(defect-> !ObjectUtil.isEmpty(defect.getHandleTaskId())).map(OperPhenomenonEntity::getId).collect(Collectors.toList()); if(CollectionUtil.isEmpty(shortagesList)){ shortagesVo.setShortages(0); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/ShowServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/ShowServiceImpl.java index 3864151..28429fb 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/ShowServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/ShowServiceImpl.java @@ -80,7 +80,6 @@ public class ShowServiceImpl implements ShowService { private final OtherService otherService; private final AccessService accessService; private final TicketService ticketService; - private final DefectService defectService; private final DutyService dutyService; private final StationService stationService; private final OverDetailsService detailsService; @@ -397,7 +396,7 @@ public class ShowServiceImpl implements ShowService { }); // 消缺率 exe.execute(() -> { - SolveHomeVO solve = defectService.solve_count(areas,DateUtil.format(DateUtil.toDate(firstDateTime.toLocalDate()),DateUtil.PATTERN_DATETIME),DateUtil.format(new Date(),DateUtil.PATTERN_DATETIME)); + SolveHomeVO solve = phenomenonService.solve_count(areas,DateUtil.format(DateUtil.toDate(firstDateTime.toLocalDate()),DateUtil.PATTERN_DATETIME),DateUtil.format(new Date(),DateUtil.PATTERN_DATETIME)); if(Math.abs(solve.getSolveCount()) > 0 && Math.abs(solve.getDefectCount()) > 0){ target.setTaget_three(BigDecimal.valueOf((double)solve.getSolveCount() / solve.getDefectCount() * 100).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); }else{ diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java index a108ff0..03ed645 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java @@ -15,7 +15,6 @@ import com.hnac.hzims.ticket.workTicket.vo.TicketMonthVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springframework.stereotype.Service; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java index 7cad00b..c7638d1 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java @@ -2,26 +2,19 @@ package com.hnac.hzims.scheduled.service.ticket.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hnac.hzims.scheduled.mapper.ticket.WorkTicketMapper; import com.hnac.hzims.scheduled.service.ticket.WorkDelayService; import com.hnac.hzims.scheduled.service.ticket.WorkPrincipalService; import com.hnac.hzims.scheduled.service.ticket.WorkTicketService; -import com.hnac.hzims.ticket.constants.TicketConstants; -import com.hnac.hzims.ticket.workTicket.entity.WorkTicketDelayEntity; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; -import com.hnac.hzims.ticket.workTicket.entity.WorkTicketPrincipalChangeEntity; import com.hnac.hzims.ticket.workTicket.vo.WorkTicketStatisticVO; import lombok.AllArgsConstructor; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.CollectionUtil; import org.springframework.stereotype.Service; import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.FutureTask; import java.util.stream.Collectors; @@ -46,32 +39,40 @@ public class WorkTicketServiceImpl extends BaseServiceImpl infoIdList = infoList.stream().map(WorkTicketInfoEntity::getId).collect(Collectors.toList()); +// List infoIdList = infoList.stream().map(WorkTicketInfoEntity::getId).collect(Collectors.toList()); work.setTotal(infoList.size()); //工作票作废 - List invalidList = infoList.stream().filter(w -> TicketConstants.FirstWorkTicketFlowStatusEnum.INVALID.getStatus().equals(w.getStatus())) + List invalidList = infoList.stream().filter(item -> "废票".equals(item.getFlowTaskName())) .collect(Collectors.toList()); work.setInvalid(CollectionUtil.isNotEmpty(invalidList) ? invalidList.size() : 0); - // 工作票完成数 - List completeList = infoList.stream().filter(w -> TicketConstants.FirstWorkTicketFlowStatusEnum.FINISH.getStatus().equals(w.getStatus())) + // 工作票结束数 + List completeList = infoList.stream().filter(item -> "结束".equals(item.getFlowTaskName())) .collect(Collectors.toList()); work.setComplete(CollectionUtil.isNotEmpty(completeList) ? completeList.size() : 0); - int transferTask = 0; - int delayTask = 0; - List moveList = workPrincipalService.list(new LambdaQueryWrapper() {{ - in(WorkTicketPrincipalChangeEntity::getTicketId, infoIdList); - }}); - if(CollectionUtil.isNotEmpty(moveList)){ - transferTask = moveList.size(); - } - List delayEntityList = workDelayService.list(Wrappers.lambdaQuery() - .in(WorkTicketDelayEntity::getTicketId, infoIdList) - ); - if(CollectionUtil.isNotEmpty(delayEntityList)){ - delayTask = delayEntityList.size(); - } - work.setDelay(delayTask); - work.setTransfer(transferTask); + // 工作票延期总数数 + List delayList = infoList.stream().filter(item -> "延期".equals(item.getInput())) + .collect(Collectors.toList()); + work.setDelay(CollectionUtil.isNotEmpty(delayList) ? delayList.size() : 0); + // 工作票移交数 + List changeList = infoList.stream().filter(item -> "转移".equals(item.getInput())) + .collect(Collectors.toList()); + work.setTransfer(CollectionUtil.isNotEmpty(changeList) ? changeList.size() : 0); +// int transferTask = 0; +// int delayTask = 0; +// List moveList = workPrincipalService.list(new LambdaQueryWrapper() {{ +// in(WorkTicketPrincipalChangeEntity::getTicketId, infoIdList); +// }}); +// if(CollectionUtil.isNotEmpty(moveList)){ +// transferTask = moveList.size(); +// } +// List delayEntityList = workDelayService.list(Wrappers.lambdaQuery() +// .in(WorkTicketDelayEntity::getTicketId, infoIdList) +// ); +// if(CollectionUtil.isNotEmpty(delayEntityList)){ +// delayTask = delayEntityList.size(); +// } +// work.setDelay(delayTask); +// work.setTransfer(transferTask); } return work; } diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/InspectContentMapper.xml similarity index 66% rename from hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanMapper.xml rename to hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/InspectContentMapper.xml index 09f72d8..f7e3e04 100644 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanMapper.xml +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/InspectContentMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ObjectMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/InspectObjectMapper.xml similarity index 66% rename from hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ObjectMapper.xml rename to hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/InspectObjectMapper.xml index d50799a..1963f43 100644 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ObjectMapper.xml +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/InspectObjectMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ContentMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskPlanMapper.xml similarity index 67% rename from hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ContentMapper.xml rename to hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskPlanMapper.xml index e68eb88..adb3d05 100644 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ContentMapper.xml +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskPlanMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IContentDefinitionService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IContentDefinitionService.java index 2393be5..9960a71 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IContentDefinitionService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IContentDefinitionService.java @@ -26,7 +26,7 @@ public interface IContentDefinitionService extends BaseService list(ContentDefinitionDTO request); default LambdaQueryWrapper getQueryWrapper(ContentDefinitionEntity entity) { - LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(entity,ContentDefinitionEntity.class); + LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(ContentDefinitionEntity.class,entity); queryWrapper.eq(Func.isNotEmpty(entity.getCreateDept()), ContentDefinitionEntity::getCreateDept, entity.getCreateDept()) .eq(Func.isNotEmpty(entity.getCreateUser()), ContentDefinitionEntity::getCreateUser, entity.getCreateUser()) .eq(Func.isNotEmpty(entity.getStatus()), ContentDefinitionEntity::getStatus, entity.getStatus()).orderByDesc(ContentDefinitionEntity::getCreateTime); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java index 1d460b9..353db6a 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java @@ -430,7 +430,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { eq(ContentEntity::getTenantId, tenantId); }}); // 返回数据 - return contents.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return contents.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } /** @@ -447,7 +447,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { eq(ObjectDangerEntity::getTenantId, tenantId); }}); // 返回数据 - return dangers.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return dangers.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } @@ -466,7 +466,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { eq(OfflineTaskEntity::getId, taskId); }}); // 返回数据 - return tasks.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return tasks.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } @@ -482,7 +482,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { List taskUsers = this.taskUserService.getOfflineTaskUser(taskIds); // 返回数据 - return taskUsers.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return taskUsers.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } /** @@ -496,7 +496,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { // 查询巡检任务 List tasks = taskService.getTaskData(taskId,currentDate); // 返回数据 - return tasks.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return tasks.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } /** @@ -510,7 +510,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { } List tasks = planService.getPlans(planIds); // 返回数据 - return tasks.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return tasks.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } @@ -527,7 +527,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { List events = eventService.list(new LambdaQueryWrapper() {{ in(EventEntity::getTaskId, taskIds); }}); - return events.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return events.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } /** @@ -543,7 +543,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { List eventAttachments = eventAttachmentService.list(new LambdaQueryWrapper() {{ in(EventAttachmentEntity::getEventId, eventIds); }}); - return eventAttachments.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return eventAttachments.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } /** @@ -559,7 +559,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { in(EventRecordEntity::getEventId, eventIds); }}); // 返回数据 - return eventRecords.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return eventRecords.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } /** @@ -574,7 +574,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { // 查询巡检任务对象 List taskObjects = taskObjectService.getExObjectData(taskIds); // 返回数据 - return taskObjects.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return taskObjects.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } /** diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java index b7d0859..1ee6546 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java @@ -63,11 +63,11 @@ public class RouteController extends BladeController { operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, action = "查询巡检路径管理列表") - public R> list(@ApiIgnore @RequestParam Map st_re_route, Query query) { + public R> list(@ApiIgnore @RequestParam Map st_re_route, Query query) { QueryWrapper queryWrapper = Condition.getQueryWrapper(st_re_route, RouteEntity.class); queryWrapper.orderByDesc("create_time", "update_time"); IPage pages = st_re_routeService.page(Condition.getPage(query), queryWrapper); - return R.data(BladePage.of(pages)); + return R.data(pages); } /** diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/EventController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/EventController.java index de43b4c..66e24cb 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/EventController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/EventController.java @@ -17,7 +17,6 @@ import com.hnac.hzinfo.inspect.task.vo.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; @@ -25,11 +24,11 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.core.tool.utils.SpringUtil; import org.springblade.core.tool.utils.StringUtil; import org.springblade.flow.core.constant.ProcessConstant; import org.springblade.flow.core.feign.IFlowClient; import org.springblade.system.feign.IDictClient; -import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -53,17 +52,11 @@ public class EventController{ /** * 获取巡检情况列表信息 */ - @GetMapping(value = "/list") + @RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST}) @ApiOperation(value = "任务查看弹窗下面的列表 巡检情况列表信息分页", notes = "传入taskId") - public R> eventList(@RequestParam Long taskId, @SpringQueryMap Query query, - @SpringQueryMap BladeUser bladeUser) { - if (bladeUser == null) { - bladeUser = new BladeUser(); - bladeUser.setTenantId("200000"); - } + public R> list(Long taskId, Query query, BladeUser bladeUser) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery().eq(EventEntity::getTaskId,taskId).orderByDesc(EventEntity::getCreateTime); - IPage pages = eventService.page(Condition.getPage(query), - (!BladeConstant.ADMIN_TENANT_ID.equals(bladeUser.getTenantId())) ? + IPage pages = eventService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(EventEntity::getTenantId, bladeUser.getTenantId()).orderByDesc(EventEntity::getCreateTime) : queryWrapper); IPage resultPages = new Page<>(pages.getCurrent(), pages.getSize(),pages.getTotal()); @@ -92,7 +85,7 @@ public class EventController{ result.add(EventListVO.builder().id(entity.getId()).objectName(objectName).projectName(projectName).isProblem(entity.getIsProblem()).checkInTime(entity.getCreateTime()).build()); }); resultPages.setRecords(result); - return R.data(BladePage.of(resultPages)); + return R.data(resultPages); } /** diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java index fb68146..3309ca8 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java @@ -24,7 +24,7 @@ import com.hnac.hzinfo.inspect.task.service.IEventService; import com.hnac.hzinfo.inspect.task.service.ITaskService; import com.hnac.hzinfo.inspect.task.service.ITaskUserService; import com.hnac.hzinfo.inspect.task.vo.TaskListQuery; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO; import com.hnac.hzinfo.inspect.task.vo.TaskVo; import com.hnac.hzinfo.inspect.utils.Condition; import io.swagger.annotations.*; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/feign/InspectTaskReportClient.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/feign/InspectTaskReportClient.java index b018474..1fbca6a 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/feign/InspectTaskReportClient.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/feign/InspectTaskReportClient.java @@ -131,7 +131,7 @@ public class InspectTaskReportClient implements IInspectTaskReportClient { if(CollectionUtil.isEmpty(taskList)){ return R.data(dutyInspectTaskVO); } - dutyInspectTaskVO.setInspectTaskIds(taskList.stream().map(TaskEntity::getId).map(id->id.toString()).collect(Collectors.joining(","))); + dutyInspectTaskVO.setInspectTaskIds(taskList.stream().map(TaskEntity::getId).map(Object::toString).collect(Collectors.joining(","))); dutyInspectTaskVO.setInspectTaskSum(taskList.size()); // 所有处理完成巡检任务 List finshList = taskList.stream().filter(o-> null != o.getStatus() && o.getStatus().equals(3)).collect(Collectors.toList()); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/TaskJob.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/TaskJob.java index 2f6f69b..dc413e6 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/TaskJob.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/TaskJob.java @@ -106,7 +106,7 @@ public class TaskJob { UpdateWrapper uwTask = new UpdateWrapper<>(); uwTask.lambda().set(TaskEntity::getStatus, Integer.valueOf(TaskStatusEnum.UNFINISH_STATUS.getStatus())) .ne(TaskEntity::getStatus, Integer.valueOf(TaskStatusEnum.FINISH_STATUS.getStatus())) - .lt(TaskEntity::getPlanEndTime, LocalDate.now()); + .lt(TaskEntity::getPlanEndTime, LocalDateTime.now()); taskService.update(uwTask); } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/ConcurrentTaskServcie.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/ConcurrentTaskServcie.java index 8dd37ee..ad2a840 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/ConcurrentTaskServcie.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/ConcurrentTaskServcie.java @@ -105,8 +105,8 @@ public class ConcurrentTaskServcie extends TaskJobService implements ITaskJobSer //添加到提醒cache task.setUserId(user.getUserId()); - remindCacheManager.addTaskToCacheList(task); - taskVideoManager.addTaskToVideoCacheList(task); +// remindCacheManager.addTaskToCacheList(task); +// taskVideoManager.addTaskToVideoCacheList(task); } } if (taskUserList.size() > 0) { diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/SeizeTaskService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/SeizeTaskService.java index e499c96..be17cef 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/SeizeTaskService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/SeizeTaskService.java @@ -88,8 +88,8 @@ public class SeizeTaskService extends TaskJobService implements ITaskJobService taskUserList.add(this.getTaskUser(user.getUserId(),task.getId(),plan.getTenantId())); //添加到提醒cache task.setUserId(user.getUserId()); - remindCacheManager.addTaskToCacheList(task); - taskVideoManager.addTaskToVideoCacheList(task); +// remindCacheManager.addTaskToCacheList(task); +// taskVideoManager.addTaskToVideoCacheList(task); } String reason = this.distributeTaskObjs(plan,task); if(reason.equals(StringUtils.EMPTY)){ diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.java index be9aae9..6366203 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.java @@ -3,7 +3,7 @@ package com.hnac.hzinfo.inspect.task.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity; import com.hnac.hzinfo.inspect.task.vo.TaskObjectOfflineVO; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.xml b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.xml index a940162..9c34318 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.xml +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.xml @@ -3,7 +3,7 @@ - + @@ -13,14 +13,14 @@ - + - + diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.java index e568a98..5576f33 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.java @@ -2,7 +2,7 @@ package com.hnac.hzinfo.inspect.task.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectOfflineVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.xml b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.xml index f75d728..b7716f6 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.xml +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.xml @@ -15,7 +15,7 @@ - SELECT * from hz_st_ex_object_project where IS_DELETED = 0 AND task_id IN diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectContentService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectContentService.java index d0a2ef0..12008f7 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectContentService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectContentService.java @@ -1,6 +1,6 @@ package com.hnac.hzinfo.inspect.task.service; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectContentVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectContentVO; import org.springblade.core.mp.base.BaseService; import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectService.java index 1f49aec..64628ae 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectService.java @@ -1,6 +1,6 @@ package com.hnac.hzinfo.inspect.task.service; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectOfflineVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO; import org.springblade.core.mp.base.BaseService; import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectService.java index 66a1265..469e963 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectService.java @@ -1,7 +1,7 @@ package com.hnac.hzinfo.inspect.task.service; import com.hnac.hzinfo.inspect.task.vo.TaskObjectOfflineVO; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO; import org.springblade.core.mp.base.BaseService; import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskService.java index 5715b8b..7f62c5a 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hnac.hzims.vo.SafeCheckStatisticVO; import com.hnac.hzims.vo.VoteChartVo; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO; import com.hnac.hzinfo.inspect.task.dto.TaskDTO; import com.hnac.hzinfo.inspect.task.entity.InspectionTaskSMS; import com.hnac.hzinfo.inspect.task.entity.TaskEntity; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectContentServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectContentServiceImpl.java index daf4e6c..0beb398 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectContentServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectContentServiceImpl.java @@ -1,13 +1,16 @@ package com.hnac.hzinfo.inspect.task.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; +import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.feign.IStationClient; import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient; import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO; import com.hnac.hzinfo.inspect.obj.entity.ContentEntity; import com.hnac.hzinfo.inspect.obj.services.ContentService; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectContentVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectContentVO; import com.hnac.hzinfo.sdk.v5.redis.RedisClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -18,9 +21,15 @@ import com.hnac.hzinfo.inspect.task.service.ITaskObjectProjectContentService; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.core.tool.utils.ObjectUtil; +import org.springblade.core.tool.utils.StringUtil; import org.springframework.stereotype.Service; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.List; +import java.util.Optional; /** * 服务实现类 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectServiceImpl.java index 1004aa1..b115b5c 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzinfo.inspect.task.service.impl; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectOfflineVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO; import org.springblade.core.mp.base.BaseServiceImpl; import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity; import com.hnac.hzinfo.inspect.task.mapper.TaskObjectProjectMapper; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectServiceImpl.java index 3643624..d421097 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectServiceImpl.java @@ -7,7 +7,8 @@ import com.hnac.hzinfo.inspect.task.mapper.TaskObjectMapper; import com.hnac.hzinfo.inspect.task.service.ITaskObjectProjectContentService; import com.hnac.hzinfo.inspect.task.service.ITaskObjectService; import com.hnac.hzinfo.inspect.task.vo.TaskObjectOfflineVO; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectContentVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO; import lombok.AllArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.CollectionUtil; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java index a710273..61b1c82 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java @@ -16,9 +16,6 @@ import com.hnac.hzims.safeproduct.feign.IImsMonCameraInfoClient; import com.hnac.hzims.vo.SafeCheckStatisticVO; import com.hnac.hzims.vo.VoteChartVo; import com.hnac.hzinfo.inspect.ai.service.IRobotService; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectContentVO; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectVO; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO; import com.hnac.hzinfo.inspect.obj.ObjContants; import com.hnac.hzinfo.inspect.obj.services.IObjectDangerService; import com.hnac.hzinfo.inspect.plan.PlanContants; @@ -548,8 +545,13 @@ public class TaskServiceImpl extends BaseServiceImpl imp .filter(Func::isNotEmpty).map(String::valueOf).collect(Collectors.joining(",")); // 获取巡检任务人员名称 String userNames = taskUserList.stream().filter(Func::isNotEmpty).map(TaskUserEntity::getUserId).filter(Func::isNotEmpty) - .map(UserCache::getUser).map(user -> Optional.ofNullable(user).map(User::getName).orElse("")) - .collect(Collectors.joining(",")); + .map(userId -> { + User user = UserCache.getUser(userId); + if(ObjectUtil.isEmpty(user)){ + return ""; + } + return user.getName(); + }).collect(Collectors.joining(",")); taskVo.setUserIds(userIds); taskVo.setUserNames(userNames); // 获取机器人信息 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/EventListVO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/EventListVO.java new file mode 100644 index 0000000..89c396b --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/EventListVO.java @@ -0,0 +1,49 @@ +package com.hnac.hzinfo.inspect.task.vo; + +import java.io.Serializable; +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.springframework.format.annotation.DateTimeFormat; + +@ApiModel(value = "巡检情况列表") +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class EventListVO implements Serializable { + + private static final long serialVersionUID = 3596553809412766823L; + + @ApiModelProperty(value = "eventId") + private Long id; + + @ApiModelProperty(value = "巡检对象名称") + private String objectName; + @ApiModelProperty(value = "巡检项目名称") + private String projectName; + + /** + * 是否问题 0:否 1 是 默认0 + */ + @ApiModelProperty(value = "是否问题 0:否 1 是 默认0") + private String isProblem; + + @DateTimeFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @ApiModelProperty(value = "登记时间") + private Date checkInTime; +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectContentVO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectContentVO.java new file mode 100644 index 0000000..3f129b5 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectContentVO.java @@ -0,0 +1,138 @@ +package com.hnac.hzinfo.inspect.task.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 任务对象项目内容 + * @author ninglong + * @create 2020-08-24 8:55 + */ +@Setter +@Getter +@ApiModel(value = "任务对象项目内容") +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class TaskObjectProjectContentVO implements Serializable { + + /** + * 内容ID + */ + @ApiModelProperty(value = "内容ID") + private Long contentId; + + /** + * 内容名称 + */ + @ApiModelProperty(value = "内容名称") + private String name; + /** + * 检测标准 + */ + @ApiModelProperty(value = "检测标准") + private String description; + + /** + * 完成标识 + */ + @ApiModelProperty(value = "完成标识 0 不可用 1 可用") + private String available; + /** + * 检测类型 + */ + @ApiModelProperty(value = "检测类型") + private String checkType; + /** + * 记录类型 + */ + @ApiModelProperty(value = "记录类型") + private String recordType; + + /** + * 内容当前状态 0 异常 1 正常 + */ + @ApiModelProperty(value = "内容当前状态 0 异常 1 正常 ") + private String currentStatus; + /** + * 内容当前值 + */ + @ApiModelProperty(value = "内容当前值") + private String currentValue; + + /** + * 文件地址 + */ + @ApiModelProperty(value = "文件地址") + private String fileUrl; + + /** + * 表针识别，表盘ID + */ + @JsonSerialize(nullsUsing = NullSerializer.class) + @ApiModelProperty(value = "表针识别，表盘ID") + private Long clockId; + + /** + * 视频巡检摄像机ID + */ + @JsonSerialize(nullsUsing = NullSerializer.class) + @ApiModelProperty(value = "视频巡检摄像机ID") + private Long cameraId; + + /** + * 检测类型子类 + */ + @ApiModelProperty(value = "检测类型子类") + private String checkTypeSon; + + /** + * 开关/灯/表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录,默认 0,0，如果有多张图则：0,0,1( 最后一位表示所在图片，最后一位1表示第二张图)，默认0,0,0 + */ + @ApiModelProperty(value = "开关/灯/表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录,默认 0,0，如果有多张图则：0,0,1( 最后一位表示所在图片，最后一位1表示第二张图)，默认0,0,0") + private String cameraAddr; + + + /** + * 其他参数，例如多联断路器内断路器的个数 + */ + @ApiModelProperty(value = "其他参数，例如多联断路器内断路器的个数") + private String otherParam; + + /** + * 校验值，用来判断当前值是否正确：枚举数据通过 “ , ”隔开, 区间通过~隔开 + */ + @ApiModelProperty(value = "校验值，用来判断当前值是否正确：枚举数据通过 “ , ”隔开, 区间通过~隔开") + private String checkVal; + + /** + * 记值方式为选择时选择值 + */ + @ApiModelProperty(value = "记值方式为选择时选择值") + private String dictType; + + @ApiModelProperty(value = "实时数据") + private String realData; + + @ApiModelProperty(value = "实时数据采集时间") + private String gatherTime; + + @ApiModelProperty(value = "绑定物模型属性标识") + private String attrSignage; + + @ApiModelProperty(value = "绑定物模型属性名称") + private String attrName; + + @ApiModelProperty(value = "设备编号") + private String emCode; + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectOfflineVO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectOfflineVO.java new file mode 100644 index 0000000..5bf8aa6 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectOfflineVO.java @@ -0,0 +1,51 @@ +package com.hnac.hzinfo.inspect.task.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springblade.core.tenant.mp.TenantEntity; + + +/** + * 实体类 + * + * @author Chill + */ +@Data +public class TaskObjectProjectOfflineVO extends TenantEntity { + + private static final long serialVersionUID = 1L; + + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private Long taskId; + /** + * 对象ID + */ + @ApiModelProperty(value = "对象ID") + private Long objectId; + /** + * 项目ID + */ + @ApiModelProperty(value = "项目ID") + private Long projectId; + + + /** + * 目标编码 + */ + @ApiModelProperty(value = "目标编码") + private String code; + /** + * 目标名称 + */ + @ApiModelProperty(value = "目标名称") + private String name; + + /** + * 目标描述 + */ + @ApiModelProperty(value = "目标描述") + private String description; +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectVO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectVO.java new file mode 100644 index 0000000..7a36742 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectVO.java @@ -0,0 +1,34 @@ +package com.hnac.hzinfo.inspect.task.vo; + +import com.google.common.collect.Lists; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +import java.io.Serializable; +import java.util.List; + +/** + * 任务对象项目 + * @author ninglong + * @create 2020-08-24 8:52 + */ +@Getter +@Setter +@ApiModel(value = "任务对象项目") +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class TaskObjectProjectVO implements Serializable { + + @ApiModelProperty(value = "任务对象项目ID") + private Long projectId; + @ApiModelProperty(value = "任务对象项目名称") + private String projectName; + @ApiModelProperty(value = "项目状态") + private Integer status; + + @Builder.Default + @ApiModelProperty(value = "任务对象项目内容") + private List contents = Lists.newArrayList(); +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectVO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectVO.java new file mode 100644 index 0000000..040e03c --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectVO.java @@ -0,0 +1,61 @@ +package com.hnac.hzinfo.inspect.task.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.google.common.collect.Lists; +import com.hnac.hzims.safeproduct.entity.DangerSourceEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; +import org.springblade.core.tool.utils.ObjectUtil; + +import java.io.Serializable; +import java.util.List; + +/** + * 任务对象 + * @author ninglong + * @create 2020-08-24 8:51 + */ +@Setter +@Getter +@ApiModel(value = "任务对象") +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class TaskObjectVO implements Serializable { + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private Long taskId; + + @ApiModelProperty(value = "任务对象ID") + private Long objId; + @ApiModelProperty(value = "任务对象名称") + private String objName; + @ApiModelProperty(value = "对象状态") + private Integer status; + + /** + * 是否重复记录 0 不允许 1允许 + */ + @ApiModelProperty(value = "是否重复记录 0 不允许 1允许") + private String duplicateRecord; + + @ApiModelProperty(value = "排序") + private Integer order; + + @ApiModelProperty(value = "巡检对象危险点信息") + private List dangers; + + @Builder.Default + @ApiModelProperty(value = "任务对象项目") + private List projects = Lists.newArrayList(); + + public Integer getOrder() { + if(ObjectUtil.isEmpty(this.order)){ + return 1; + } + return order; + } +} diff --git a/hzims-service/message/pom.xml b/hzims-service/message/pom.xml index 56dd88f..b3856f8 100644 --- a/hzims-service/message/pom.xml +++ b/hzims-service/message/pom.xml @@ -88,6 +88,7 @@ org.springblade blade-system-api + 5.0.2-SNAPSHOT diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java index c718ab3..c7a93ff 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java @@ -90,7 +90,7 @@ public class MessageClient extends BladeController implements IMessageClient{ entity.setDeptName(Func.isNotEmpty(entity.getDeptName()) ? entity.getDeptName() : this.getDeptNameById(entity.getDeptId())); entity.setMessageId(IdWorker.getId()); entity.setPusher(userId.toString()); - entity.setPusherName(Optional.ofNullable(UserCache.getUser(userId)).map(User::getName).orElse(null)); + //entity.setPusherName(Optional.ofNullable(UserCache.getUser(userId)).map(User::getName).orElse(null)); entity.setPushType(MessageConstants.IMMEDIATELY); entity.setAccount(userId.toString()); entity.setPlanTime(LocalDateTime.now()); @@ -98,11 +98,11 @@ public class MessageClient extends BladeController implements IMessageClient{ entity.setCreateDept(entity.getDeptId()); return entity; }).collect(Collectors.toList()); - boolean isSave = recordService.saveBatch(messages); + /*boolean isSave = recordService.saveBatch(messages); if(isSave){ return R.data(recordService.sendWxMessageByUser(request,messages)); - } - return R.data(false); + }*/ + return R.data(recordService.sendWxMessageByUser(request,messages)); } @PostMapping(PLAN_SEND_MESSAGE) diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java index bf9b069..6ab12eb 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java @@ -394,19 +394,15 @@ public class MessagePushRecordServiceImpl extends BaseServiceImpl records) { - Map param = new HashMap(); - param.put("templateId",message.getTemplateId()); - param.put("skip",message.getSkipUrl()); - param.put("map",message.getMap()); - param.put("userIds", Arrays.stream(message.getUserIds().split(",")).collect(Collectors.toList())); + WxMessageServiceImpl service = SpringUtil.getBean(WxMessageServiceImpl.class); - boolean isSend = service.send(param); - if (isSend) { + boolean isSend = service.send(message); + /*if (isSend) { this.update(Wrappers.lambdaUpdate() .set(MessagePushRecordEntity::getPushTime, LocalDateTime.now()) .set(MessagePushRecordEntity::getStatus, MessageConstants.PUSH_SUCCESS) .in(MessagePushRecordEntity::getId, records.stream().map(MessagePushRecordEntity::getId).collect(Collectors.toList()))); - } + }*/ return isSend; } diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java index 337983d..aea5845 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.hnac.hzims.message.MessageConstants; import com.hnac.hzims.message.dto.AppPushDto; import com.hnac.hzims.message.dto.PushDto; +import com.hnac.hzims.message.dto.WxMessageDTO; import com.hnac.hzims.message.entity.MessagePushRecordEntity; import com.hnac.hzims.message.log.aspect.SaveLog; import com.hnac.hzims.message.service.IMessageService; @@ -16,6 +17,7 @@ import com.hnac.hzinfo.core.push.model.PushPlatform; import com.hnac.hzinfo.core.push.model.PushResponse; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.logger.BladeLogger; import org.springblade.core.secure.utils.AuthUtil; @@ -24,6 +26,9 @@ import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.resource.feign.IPushClient; import org.springblade.resource.vo.PushInfoVO; +import org.springblade.system.entity.PushTemplate; +import org.springblade.system.feign.IWxPushClient; +import org.springblade.system.vo.WxPushFeignVO; import org.springframework.stereotype.Service; import java.io.*; @@ -38,6 +43,7 @@ import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.FutureTask; import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; /** * @author hx @@ -48,6 +54,7 @@ import java.util.concurrent.atomic.AtomicReference; public class WxMessageServiceImpl implements IMessageService { private final IPushClient pushClient; + private final IWxPushClient wxPushClient; private final BladeLogger logger; private final ExecutorService appMessagePushExecutor; @@ -75,50 +82,13 @@ public class WxMessageServiceImpl implements IMessageService { return false; } - public boolean send(Map param) { - OutputStream out = null; - try{ - URL serverUrl = new URL("https://3d.hnaccloud.com/api/blade-system/wxPush/sendPush"); - HttpURLConnection conn = (HttpURLConnection) serverUrl.openConnection(); - conn.setRequestMethod("GET"); - conn.setRequestProperty("Content-type", "application/json"); - //必须设置false，否则会自动redirect到重定向后的地址 - conn.setInstanceFollowRedirects(false); - conn.connect(); - String result = responseFormat(conn); - //获取输出流 - out = conn.getOutputStream(); - log.error("send_wx_message_param: {}",param.toString()); - //输出流里写入POST参数 - out.write(param.toString().getBytes()); - out.flush(); - out.close(); - }catch (Exception ex){ - log.error("send_wx_message_error: {} ", ex.getMessage()); - } - return false; - } - - /*** - * 获取返回的内容 - * @param connection - * @return - */ - private String responseFormat(HttpURLConnection connection) { - StringBuilder stringBuilder = new StringBuilder(); - //将返回的输入流转换成字符串 - try ( - InputStream inputStream = connection.getInputStream(); - InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8); - BufferedReader bufferedReader = new BufferedReader(inputStreamReader) - ) { - String str; - while ((str = bufferedReader.readLine()) != null) { - stringBuilder.append(str); - } - } catch (IOException e) { - return null; - } - return stringBuilder.toString(); - } + public boolean send(WxMessageDTO message) { + PushTemplate template = new PushTemplate(); + template.setTemplateId(message.getTemplateId()); + template.setSkipUrl(message.getSkipUrl()); + template.setMap(message.getMap()); + template.setUserIds(Arrays.stream(message.getUserIds().split(",")).collect(Collectors.toList())); + R result = wxPushClient.sendPushTemplateByUserId(template); + return result.isSuccess(); + } } diff --git a/hzims-service/operational/pom.xml b/hzims-service/operational/pom.xml index 03d3536..ea3b0b7 100644 --- a/hzims-service/operational/pom.xml +++ b/hzims-service/operational/pom.xml @@ -139,7 +139,6 @@ org.springblade blade-user-api - 5.0.1.RELEASE diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java index 561085b..b95aca3 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java @@ -340,13 +340,13 @@ public class OperAccessTaskServiceImpl extends BaseServiceImpl materials) { + public void updateMaterials(Long planId, Long taskId, List materials) { if (CollectionUtils.isEmpty(materials)) { materials = new ArrayList<>(); } //查询已经存在的检修库明细，并删除部分需要删除的 List existsDetails = materialService.list(new LambdaQueryWrapper() {{ - eq(OperAccessMaterialEntity::getPlanId, planId); + eq(Func.isNotEmpty(planId),OperAccessMaterialEntity::getPlanId, planId); eq(OperAccessMaterialEntity::getTaskId, taskId); eq(OperAccessMaterialEntity::getIsDeleted, 0L); }}); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.java index 0c55878..c989ecc 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.java @@ -20,5 +20,5 @@ public interface AlarmHandleMapper extends UserDataScopeBaseMapper selectHandlePage(IPage page,@Param("param") HandleQueryVo param); - List handles(@Param("types") List types,@Param("alarm") Integer alarm,@Param("start") String start,@Param("end") String end); + List handles(@Param("types") List types,@Param("start") String start,@Param("end") String end); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.xml index ec557f8..18304a2 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.xml +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.xml @@ -51,9 +51,6 @@ and handler.create_time between #{start} and #{end} - - and type = #{alarm} - and (detail.DELAY_TIME > #{end} or detail.DELAY_TIME is null) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/HistoryAbnormalAlarmService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/HistoryAbnormalAlarmService.java index 8ab23c1..ca936c6 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/HistoryAbnormalAlarmService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/HistoryAbnormalAlarmService.java @@ -37,5 +37,4 @@ public interface HistoryAbnormalAlarmService extends BaseService alarmData(AlarmDataPageVo page,Query query); List queryStationName(); - } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java index a151d74..9daebb3 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java @@ -151,9 +151,13 @@ public class AlarmHandleServiceImpl extends BaseServiceImpl handles(List types,Integer alarm) { + public List handles(List types,Integer isEarly) { + if(AbnormalAlarmConstant.INTELLIGENCE_ALARM.equals(isEarly)){ + String end = DateUtil.format(new Date(),DateUtil.PATTERN_DATETIME); + return this.baseMapper.handles(types,null,end); + } String start = DateUtil.format(new Date(),DateUtil.PATTERN_DATE) + " 00:00:00"; String end = DateUtil.format(new Date(),DateUtil.PATTERN_DATETIME); - return this.baseMapper.handles(types,alarm,start,end); + return this.baseMapper.handles(types,start,end); } } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java index 71ba8b5..554173d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java @@ -35,6 +35,7 @@ import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.beans.factory.annotation.Value; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import java.lang.reflect.Field; @@ -42,6 +43,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** @@ -59,6 +61,8 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl voList = historyAbnormalAlarmVos.parallelStream().peek(s -> s.setTimes((s.getEndTime().getTime() - s.getStartTime().getTime()))).collect(Collectors.toList()); //次数统计 Map timesList = voList.stream().collect(Collectors.groupingBy(HistoryAbnormalAlarmEntity::getStationName, - Collectors.counting())); + Collectors.counting())); //时间统计 Map durationList = voList.stream().collect(Collectors.groupingBy(HistoryAbnormalAlarmEntity::getStationName, - Collectors.summingLong(HistoryAbnormalAlarmVo::getTimes))); + Collectors.summingLong(HistoryAbnormalAlarmVo::getTimes))); List res = new ArrayList<>(); for (Map.Entry entry : durationList.entrySet()) { //累计时长 @@ -141,8 +145,8 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl page = Condition.getPage(query); page.setTotal(res.size()); if (entityIsNull(query)) { @@ -209,6 +213,10 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl wrapper = Wrappers.lambdaQuery(); wrapper.eq(StationEntity::getServeType,HomePageConstant.HYDROPOWER_SERVETYPE); @@ -261,11 +269,12 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl> history(AnalyzeDataCondition analyzeDataCondition) { return service.history(analyzeDataCondition); } + + @ApiOperation("微信消息推送测试") + @PostMapping("/sendWxMessage") + @ApiOperationSupport(order = 1) + public R sendWxMessage() { + return service.sendWxMessage(); + } } \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/DeviceDataService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/DeviceDataService.java index 6726c14..c69fe0a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/DeviceDataService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/DeviceDataService.java @@ -19,4 +19,6 @@ public interface DeviceDataService { R> real(RealDataSearchPO search); R> history(AnalyzeDataCondition analyzeDataCondition); + + R sendWxMessage(); } \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/DeviceDataServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/DeviceDataServiceImpl.java index cc96c56..91c2a11 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/DeviceDataServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/DeviceDataServiceImpl.java @@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.esotericsoftware.minlog.Log; import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo; +import com.hnac.hzims.message.dto.WxMessageDTO; +import com.hnac.hzims.message.fegin.IMessageClient; import com.hnac.hzims.operational.census.service.DeviceDataService; import com.hnac.hzims.operational.census.vo.RealVo; import com.hnac.hzinfo.datasearch.PointData; @@ -15,10 +17,13 @@ import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO; import com.hnac.hzinfo.sdk.analyse.AnalyseDataSearchClient; import com.hnac.hzinfo.sdk.core.response.HzPage; import com.hnac.hzinfo.sdk.core.response.Result; +import io.swagger.annotations.ApiModelProperty; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.mp.support.QueryField; +import org.springblade.core.mp.support.SqlCondition; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.StringUtil; @@ -26,6 +31,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; +import javax.validation.constraints.NotNull; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -42,6 +49,8 @@ public class DeviceDataServiceImpl implements DeviceDataService { private final AnalyseDataSearchClient analyseDataSearchClient; + private final IMessageClient messageClient; + /** * 实时数据 * @param search @@ -67,4 +76,44 @@ public class DeviceDataServiceImpl implements DeviceDataService { Result> result = analyseDataSearchClient.getAnalyzeDataByAnalyzeCode(analyzeDataCondition); return R.data(result.getData()); } + + /** + * 微信消息推送测试 + * @return + */ + @Override + public R sendWxMessage() { + WxMessageDTO message = new WxMessageDTO(); + // 模板Id + message.setTemplateId("hIgINCsjpG-gyCKh8wzwBWjR-hkbjkNLFTXQEsnR_Z8"); + // 微信消息跳转地址 + message.setSkipUrl("http://baidu.com"); + // 机构Id + message.setDeptId(200000010709L); + // 业务关键字 + message.setBusinessKey("wx_message_test"); + // 业务分类关键字 + message.setBusinessClassify("wx_message_test"); + // 任务Id + message.setTaskId(1686044105416650753L); + // 微信参数键值对 + HashMap map = new HashMap<>(); + map.put("thing18","云南维西拉波洛水电站"); + map.put("thing5","1号机组"); + map.put("thing11","拉波洛电站数据_1号机组PLC.(D182)机组故障_分"); + map.put("thing14","故障"); + map.put("time2","2023-08-28 16:08:19"); + message.setMap(map); + // 消息内容 + message.setContent("杨胜军在测试微信消息推送"); + // 消息主题 + message.setSubject("微信公众号推送消息测试"); + // 推送用户 + message.setUserIds("1678930425282785281,1696056255481344002,1696073993931157505"); + // 创建用户 + message.setCreateUser(1394936547620040706L); + // 租户Id + message.setTenantId("200000"); + return messageClient.sendWxMessage(message); + } } \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java index 9cb52a5..27e4d92 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo; import com.hnac.hzims.fdp.feign.IFdpMonitorClient; @@ -24,6 +25,7 @@ import com.hnac.hzims.operational.config.service.StAlamRecordService; import com.hnac.hzims.operational.config.service.StFocusPropertiesService; import com.hnac.hzims.operational.config.vo.*; import com.hnac.hzims.operational.main.service.IMainSystemMonitoringService; +import com.hnac.hzims.operational.main.vo.RealDeviceVo; import com.hnac.hzims.operational.main.vo.SoeDataVo; import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.service.IStationService; @@ -739,10 +741,17 @@ public class StAlamRecordServiceImpl extends BaseServiceImpl handles = handleService.handles(Collections.singletonList(AbnormalAlarmConstant.EARLY_WARNING),AbnormalAlarmConstant.INTELLIGENCE_ALARM); Map map = stations.stream().collect(Collectors.toMap(StationEntity::getCode,StationEntity::getName)); - return list.stream().filter(fault -> map.containsKey(fault.getStation())).peek(o-> o.setStationName(map.get(o.getStation()))).collect(Collectors.toList()); + return list.stream().filter(fault -> map.containsKey(fault.getStation())).peek(record -> { + record.setStationName(map.get(record.getStation())); + if(CollectionUtil.isEmpty(handles)){ + record.setIsHandle(false); + }else{ + record.setIsHandle(handles.stream().map(AlarmHandleEntity::getAlarmId).collect(Collectors.toList()).contains(String.valueOf(record.getFaultId()))); + } + }).sorted(Comparator.comparing((FaultVo::getIsHandle)).reversed().thenComparing(FaultVo::getCreateTime).reversed()).collect(Collectors.toList()); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/FaultVo.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/FaultVo.java index 74a0f60..a76ef46 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/FaultVo.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/FaultVo.java @@ -27,4 +27,6 @@ public class FaultVo { private String info; private String name; + + private Boolean isHandle; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperPhenomenonServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperPhenomenonServiceImpl.java index 2624f0a..4032dff 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperPhenomenonServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperPhenomenonServiceImpl.java @@ -547,8 +547,7 @@ public class OperPhenomenonServiceImpl extends BaseServiceImplString.valueOf(o.getId())).collect(Collectors.joining(","))); defectVO.setDefectSum(operPhenomenonList.size()); // 消缺数 - List defectList = operPhenomenonList.stream().filter(o -> (Func.isNotEmpty(o.getIsDefect()) && o.getIsDefect() == 0) || "1".equals(o.getConclusionStatus())). - map(OperPhenomenonEntity::getId).collect(Collectors.toList()); + List defectList = operPhenomenonList.stream().filter(defect -> !ObjectUtil.isEmpty(defect.getHandleTaskId())).map(OperPhenomenonEntity::getId).collect(Collectors.toList()); if(CollectionUtil.isEmpty(defectList)){ defectVO.setDefect(0); return defectVO; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java index 105b5dd..f8520ed 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java @@ -9,14 +9,12 @@ import com.hnac.hzims.operational.access.constants.AccessConstants; import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; import com.hnac.hzims.operational.access.service.IOperAccessTaskService; import com.hnac.hzims.operational.defect.constants.DefectConstant; -import com.hnac.hzims.operational.defect.entity.OperDefectEntity; +import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; import com.hnac.hzims.operational.defect.service.IOperDefectService; +import com.hnac.hzims.operational.defect.service.IOperPhenomenonService; import com.hnac.hzims.operational.main.bo.OperationalReportBO; -import com.hnac.hzims.operational.main.service.IMainReportService; import com.hnac.hzims.operational.main.vo.DefectReportVO; import com.hnac.hzims.operational.main.vo.OperationalReportVO; -import com.hnac.hzims.operational.report.vo.PersonalMonthReportVO; -import com.hnac.hzims.operational.report.vo.StationReportAllVO; import com.hnac.hzims.operational.maintenance.constants.MaintenanceConstant; import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity; import com.hnac.hzims.operational.maintenance.service.IOperMaintenanceTaskService; @@ -55,7 +53,7 @@ public class MainReportController extends BladeController { private final IOperMaintenanceTaskService maintenanceTaskService; private final IOperAccessTaskService accessTaskService; - + private final IOperPhenomenonService operPhenomenonService; @ApiLog @ApiOperationSupport(order = 10) @@ -68,16 +66,16 @@ public class MainReportController extends BladeController { Date startTime = DateUtil.parse(startDate, DateUtil.PATTERN_DATE); Date endTime = DateUtil.plusDays(DateUtil.parse(endDate, DateUtil.PATTERN_DATE), 1); - List list = defectService.list(new LambdaQueryWrapper() {{ - gt(OperDefectEntity::getCreateTime, startTime); - le(OperDefectEntity::getCreateTime, endTime); + List list = operPhenomenonService.list(new LambdaQueryWrapper() {{ + ge(OperPhenomenonEntity::getCreateTime, startTime); + le(OperPhenomenonEntity::getCreateTime, endTime); }}); if (CollectionUtil.isEmpty(list)) { return R.data(new HashMap<>()); } //按照日期将查询结果分类 - Map> map = list.stream().collect(Collectors.groupingBy(o -> DateUtil.formatDate(o.getCreateTime()))); + Map> map = list.stream().collect(Collectors.groupingBy(o -> DateUtil.formatDate(o.getCreateTime()))); Map data = new TreeMap<>(); Date date = DateUtil.plusDays(startTime, 0); do { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java index baa7595..9f5cf5a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java @@ -87,12 +87,19 @@ public class MainWorkBenchController extends BladeController { * 根据用户权限获取路由 * * @return - */ @ApiLog @ApiOperationSupport(order = 50) @ApiOperation("获取路由") @PostMapping("/getHomePageWorkBench") public R getHomePageWorkBench(@Valid @RequestBody RoutingParamVo vo) { return R.data(workBenchService.getHomePageWorkBench(vo)); + }*/ + + @ApiLog + @ApiOperationSupport(order = 60) + @ApiOperation("首页工作台路由") + @PostMapping("/getHomePageWorkBench") + public R homeStagingRoute(@Valid @RequestBody RoutingParamVo vo) { + return R.data(workBenchService.route(vo)); } } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.java index 173a0cc..76449c6 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.java @@ -26,4 +26,6 @@ public interface MainWorkBenchMapper extends UserDataScopeBaseMapper stationTypes,List deptList,@Param("excludeDept") Long excludeDept,@Param("ascriptionUser") Long ascriptionUser); List selectMainWorkBenchByTypes(@Param(value = "type") String type,@Param(value = "refDomains") List refDomains,@Param("refTerminal") String refTerminal,@Param("stationTypes") List stationTypes); + + List stagingRoute(@Param("terminal") String terminal,@Param("types") List types,@Param("category") int category); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.xml index b5b700f..9d43528 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.xml +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.xml @@ -94,5 +94,15 @@ order by ord - + diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IMainWorkBenchService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IMainWorkBenchService.java index cc9e0cd..f52a203 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IMainWorkBenchService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IMainWorkBenchService.java @@ -38,4 +38,5 @@ public interface IMainWorkBenchService extends BaseService InDustryVo getHomePageWorkBench(RoutingParamVo vo); + InDustryVo route(RoutingParamVo vo); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AppHomeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AppHomeServiceImpl.java index e750044..e9a531c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AppHomeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AppHomeServiceImpl.java @@ -539,6 +539,7 @@ public class AppHomeServiceImpl implements IAppHomeService { e.printStackTrace(); Thread.currentThread().interrupt(); } + pool.shutdown(); // 任务完成率 int taskSum = item.getDefectSum() + item.getInspectionTaskCount() + item.getMaintenanceTaskCount() + item.getOverhaulTaskCount(); int finishSum = item.getSolvedCount() + item.getInspectionTaskFinishCount() + item.getMaintenanceTaskFinishCount() + item.getOverhaulTaskFinishCount(); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java index 592fae1..f09e610 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java @@ -491,10 +491,12 @@ public class AreaMonthReportServiceImpl implements IAreaMonthReportService { ticketChartCell.setTicketName(value.getFileName()); if (value.getTicketType() == 2) { List yearTicketCollect = Optional.ofNullable(yearTicket.getData()).orElse(new ArrayList<>()).stream() + .filter(s -> s.getSignageCode() != null) .filter(s -> stationId.equals(s.getSignageCode())) .filter(s -> s.getType().equals(value.getType())).collect(Collectors.toList()); List monthTicketCollect = Optional.ofNullable(monthTicket.getData()).orElse(new ArrayList<>()).stream() - .filter(s -> s.getSignageCode().equals(stationId)) + .filter(s -> s.getSignageCode() != null) + .filter(s -> stationId.equals(s.getSignageCode())) .filter(s -> s.getType().equals(value.getType())).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(yearTicketCollect)) { //年合格率和数量 @@ -521,10 +523,12 @@ public class AreaMonthReportServiceImpl implements IAreaMonthReportService { } if (value.getTicketType() == 1) { List yearOperateCollect = Optional.ofNullable(yearOperateTicket.getData()).orElse(new ArrayList<>()).stream() + .filter(s -> s.getSignageCode() != null) .filter(s -> stationId.equals(s.getSignageCode())) .filter(s -> s.getTicketType().equals(value.getType())).collect(Collectors.toList()); List monthOperateCollect = Optional.ofNullable(monthOperateTicket.getData()).orElse(new ArrayList<>()).stream() - .filter(s -> s.getSignageCode().equals(stationId)) + .filter(s -> s.getSignageCode() != null) + .filter(s -> stationId.equals(s.getSignageCode())) .filter(s -> s.getTicketType().equals(value.getType())).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(yearOperateCollect)) { //年合格率和数量 @@ -590,8 +594,8 @@ public class AreaMonthReportServiceImpl implements IAreaMonthReportService { ticketMap2.put("info", "合格率"); ticketMap.put("ticketMon" + ticketType, String.valueOf(chartCell.getTicketMon())); ticketMap.put("ticketYear" + ticketType, String.valueOf(chartCell.getTicketYear())); - ticketMap2.put("ticketMon" + ticketType, chartCell.getTicketMonPerc()* 100 + "%"); - ticketMap2.put("ticketYear" + ticketType, chartCell.getTicketYeaPercr()* 100 + "%"); + ticketMap2.put("ticketMon" + ticketType, new BigDecimal(chartCell.getTicketMonPerc()).multiply(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue() + "%"); + ticketMap2.put("ticketYear" + ticketType,new BigDecimal(chartCell.getTicketYeaPercr()).multiply(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue()+ "%"); } ticketListRes.add(ticketMap); ticketListRes.add(ticketMap2); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java index 717f72e..f047a22 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java @@ -474,6 +474,7 @@ public class HomeServiceImpl implements HomeService { e.printStackTrace(); Thread.currentThread().interrupt(); } + exe.shutdown(); return target; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java index f64551f..500ecd8 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java @@ -26,6 +26,7 @@ import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.entity.Dept; import org.springblade.system.feign.ISysClient; +import org.springblade.system.user.cache.UserCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -176,7 +177,7 @@ public class MainWorkBenchServiceImpl extends BaseServiceImpl list = this.baseMapper.selectMainWorkBenchByType(deptCategory.toString(), null, vo.getRefTerminal(), stations.stream().map(StationEntity::getType).collect(Collectors.toList()), deptList,dept.getId(),user.getUserId()); + List list = this.baseMapper.selectMainWorkBenchByType(deptCategory.toString(), null, vo.getRefTerminal(), stations.stream().map(StationEntity::getType).distinct().collect(Collectors.toList()), deptList,dept.getId(),user.getUserId()); // 路由列表包含指定用户，过滤非指定用户数据 boolean isDesign = CollectionUtil.isNotEmpty(list.stream().filter(o->StringUtils.isNotEmpty(o.getAscriptionUser())).collect(Collectors.toList())); if(isDesign){ @@ -187,4 +188,79 @@ public class MainWorkBenchServiceImpl extends BaseServiceImpl stations = stationService.list(); + if(CollectionUtil.isEmpty(stations)){ + return new InDustryVo(); + } + List types = stations.stream().map(StationEntity::getType).distinct().collect(Collectors.toList()); + // 用户权限机构 + R> result = sysClient.getDeptByCurrentUser(); + if(!result.isSuccess() || CollectionUtil.isEmpty(result.getData())){ + return new InDustryVo(); + } + // 首页分类 + int category = this.userCategory(result.getData()); + List routes = this.baseMapper.stagingRoute(terminal,types,category); + if(CollectionUtil.isEmpty(routes)){ + return new InDustryVo(); + } + // 所属机构 + List depts = result.getData().stream().map(o->o.getId().toString()).collect(Collectors.toList()); + // 所属用户 + String user = AuthUtil.getUserId().toString(); + InDustryVo dustry = new InDustryVo(); + MainWorkBenchExtendVo workBench = new MainWorkBenchExtendVo(); + if(CollectionUtil.isEmpty(routes.stream().filter(o->StringUtils.isNotEmpty(o.getRefDept())).collect(Collectors.toList())) && + CollectionUtil.isEmpty(routes.stream().filter(o->StringUtils.isNotEmpty(o.getAscriptionUser())).collect(Collectors.toList()))){ + // 设置结果集 + workBench.setMainWorkBenchEntityList(routes); + }else if(CollectionUtil.isEmpty(routes.stream().filter(o->StringUtils.isNotEmpty(o.getRefDept())).collect(Collectors.toList()))){ + // 设置结果集 + workBench.setMainWorkBenchEntityList(routes.stream().filter(o->StringUtils.isNotEmpty(o.getAscriptionUser()) && o.getAscriptionUser().contains(user)).collect(Collectors.toList())); + }else{ + // 设置结果集 + workBench.setMainWorkBenchEntityList(routes.stream().filter(o->{ + if(StringUtils.isEmpty(o.getRefDept())){ + return false; + } + for(String deptId: depts) { + if (o.getRefDept().contains(deptId)) { + return true; + } + } + return false; + }).collect(Collectors.toList())); + } + if(CollectionUtil.isEmpty(workBench.getMainWorkBenchEntityList())){ + workBench.setMainWorkBenchEntityList(routes.stream().filter(o-> StringUtils.isEmpty(o.getAscriptionUser()) && StringUtils.isEmpty(o.getRefDept())).collect(Collectors.toList())); + } + dustry.setMainWorkBenchExtendVo(workBench); + return dustry; + } + + /** + * 用户所属机构分类 + * @return + */ + private int userCategory(List depts) { + Dept dept = depts.stream().min(Comparator.comparing(Dept::getDeptCategory)).get(); + if(ObjectUtil.isEmpty(dept)){ + return HomePageConstant.STATION; + } + return dept.getDeptCategory(); + } } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java index b4d081e..3f35b46 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java @@ -94,7 +94,7 @@ public class MaintenanceTaskCreateTask { //生成日常巡检任务并插入数据库 for (int i = startIndex; i < endIndex; i++) { - this.generateTaskByPlan(planEntities.get(i)); + this.generateTaskByPlan(planEntities.get(i),true); } Thread.sleep(1000); @@ -110,18 +110,18 @@ public class MaintenanceTaskCreateTask { * @param planEntity * @return */ - public void generateTaskByPlan(OperMaintenancePlanEntity planEntity) { + public void generateTaskByPlan(OperMaintenancePlanEntity planEntity,Boolean flag) { OperMaintenanceTaskEntity taskEntity = BeanUtil.copy(planEntity,OperMaintenanceTaskEntity.class); //拆分设备 每个设备生成一条任务 if(StringUtil.isNotBlank(planEntity.getEmCode())){ List emCodeList = Arrays.asList(planEntity.getEmCode().split(",")); for(String emCode : emCodeList){ taskEntity.setEmCode(emCode); - maintenanceService.fillTask(taskEntity,planEntity); + maintenanceService.fillTask(taskEntity,planEntity,flag); } } else { - maintenanceService.fillTask(taskEntity,planEntity); + maintenanceService.fillTask(taskEntity,planEntity,flag); } } @@ -195,9 +195,11 @@ public class MaintenanceTaskCreateTask { Map params = new HashMap() {{ put("taskId", taskEntity.getId()); String userId = taskEntity.getDisposer(); - List userIdList = Stream.of(userId.split(",")).collect(Collectors.toList()); - String taskUsers = userIdList.stream().filter(o -> StringUtils.isNotBlank(o)).map(s -> "taskUser_".concat(s)).collect(Collectors.joining(",")); - put("initUserIds", taskUsers); + List userIds = Stream.of(userId.split(",")).collect(Collectors.toList()); + Stream.iterate(0, i -> i + 1).limit(5).forEach(index -> { + String key = index == 0 ? "initUserIds" : "initUserIds".concat(String.valueOf(index)); + put(key,index + 1 > userIds.size() ? "" : "taskUser_".concat(userIds.get(index))); + }); put("operMaintenanceTaskEntityVo",vo); }}; R flowResult = flowClient.startProcessInstanceContainNameByKey(processDefinitionKey, String.valueOf(taskEntity.getId()), taskEntity.getTitle(), params); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/MaintenanceService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/MaintenanceService.java index c370508..d58df2a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/MaintenanceService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/MaintenanceService.java @@ -38,5 +38,5 @@ public interface MaintenanceService { * @param taskEntity * @param finalPlanEntity */ - void fillTask(OperMaintenanceTaskEntity taskEntity, OperMaintenancePlanEntity finalPlanEntity); + void fillTask(OperMaintenanceTaskEntity taskEntity, OperMaintenancePlanEntity finalPlanEntity,Boolean flag); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java index 8983c96..445c4e7 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java @@ -6,10 +6,10 @@ import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.google.common.collect.Lists; import com.hnac.hzims.common.utils.DateUtil; import com.hnac.hzims.message.MessageConstants; import com.hnac.hzims.message.dto.BusinessMessageDTO; -import com.hnac.hzims.message.dto.MessagePushRecordDto; import com.hnac.hzims.message.dto.PlanMsgRecordDto; import com.hnac.hzims.message.entity.config.MessageTemplateEntity; import com.hnac.hzims.message.fegin.IMessageClient; @@ -34,8 +34,6 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; import org.springblade.flow.core.feign.IFlowClient; import org.springblade.system.feign.ISysClient; -import org.springblade.system.user.cache.UserCache; -import org.springblade.system.user.entity.User; import org.springframework.beans.BeanUtils; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.stereotype.Service; @@ -51,7 +49,6 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; import java.util.concurrent.ThreadPoolExecutor; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -273,13 +270,13 @@ public class MaintenanceServiceImpl implements MaintenanceService { //拆分设备 每个设备生成一条任务 if (StringUtil.isNotBlank(finalPlanEntity.getEmCode())) { log.info("finalPlanEntity.getEmCode() : {}", finalPlanEntity.getEmCode()); - List emCodeList = Arrays.asList(finalPlanEntity.getEmCode().split(",")); + String[] emCodeList = finalPlanEntity.getEmCode().split(","); for (String emCode : emCodeList) { taskEntity.setEmCode(emCode); - this.fillTask(taskEntity, finalPlanEntity); + this.fillTask(taskEntity, finalPlanEntity,false); } } else { - this.fillTask(taskEntity, finalPlanEntity); + this.fillTask(taskEntity, finalPlanEntity,false); } } @@ -291,7 +288,7 @@ public class MaintenanceServiceImpl implements MaintenanceService { * @param taskEntity * @param finalPlanEntity */ - public void fillTask(OperMaintenanceTaskEntity taskEntity, OperMaintenancePlanEntity finalPlanEntity) { + public void fillTask(OperMaintenanceTaskEntity taskEntity, OperMaintenancePlanEntity finalPlanEntity,Boolean flag) { DefaultTransactionDefinition defaultTransactionDefinition = new DefaultTransactionDefinition(); defaultTransactionDefinition.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); TransactionStatus transaction = dataSourceTransactionManager.getTransaction(defaultTransactionDefinition); @@ -327,7 +324,7 @@ public class MaintenanceServiceImpl implements MaintenanceService { taskService.save(taskEntity); dataSourceTransactionManager.commit(transaction); //启动流程 - String processInstanceId = this.startProcess(finalPlanEntity.getProcDefId(), taskEntity); + String processInstanceId = this.startProcess(finalPlanEntity.getProcDefId(), taskEntity,flag); //推送消息 CompletableFuture operMaintenanceTaskEntityCompletableFuture = CompletableFuture.runAsync(() -> { @@ -354,28 +351,29 @@ public class MaintenanceServiceImpl implements MaintenanceService { * * @author xiashandong **/ - private String startProcess(String processDefinitionKey, OperMaintenanceTaskEntity taskEntity) { + private String startProcess(String processDefinitionKey, OperMaintenanceTaskEntity taskEntity,Boolean flag) { OperMaintenanceTaskEntityVo operMaintenanceTaskEntityVo = new OperMaintenanceTaskEntityVo(); BeanUtils.copyProperties(taskEntity, operMaintenanceTaskEntityVo); Map params = new HashMap<>(); params.put("taskId", taskEntity.getId()); - List userIdList = Stream.of(taskEntity.getDisposer().split(",")).collect(Collectors.toList()); - String taskUsers = userIdList.stream().filter(o -> StringUtils.isNotBlank(o)).map(s -> { - return "taskUser_".concat(s); - }).collect(Collectors.joining(",")); - params.put("initUserIds", taskUsers); + if(flag){ + params.put("startFlowUserId", taskEntity.getCreateUser().toString()); + } + List userIds = Stream.of(taskEntity.getDisposer().split(",")).collect(Collectors.toList()); + Stream.iterate(0, i -> i + 1).limit(5).forEach(index -> { + String key = index == 0 ? "initUserIds" : "initUserIds".concat(String.valueOf(index)); + params.put(key,index + 1 > userIds.size() ? "" : "taskUser_".concat(userIds.get(index))); + }); params.put("operMaintenanceTaskEntityVo", operMaintenanceTaskEntityVo); - return flowClient.startProcessInstanceContainNameByKey(processDefinitionKey, String.valueOf(taskEntity.getId()), taskEntity.getTitle(), params).getData().getProcessInstanceId(); } + /* + 推送日常维护任务消息 - /** - * 推送日常维护任务消息 - * - * @return void + @return void * @Param taskEntity 日常维护任务 - **/ + */ private void pushTaskMessage(OperMaintenanceTaskEntity taskEntity) { log.info("开始保存{}的日常维护消息推送记录", taskEntity.getDisposer()); R templateR = messageClient.getMsgTemplateById(taskEntity.getMessageTemplateId()); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenancePlanServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenancePlanServiceImpl.java index 59297a6..2099a87 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenancePlanServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenancePlanServiceImpl.java @@ -108,7 +108,7 @@ public class OperMaintenancePlanServiceImpl extends BaseServiceImpl { try{ - schedule.generateTaskByPlan(planEntity); + schedule.generateTaskByPlan(planEntity,false); //更新任务派发时间 this.update(new LambdaUpdateWrapper().set(OperMaintenancePlanEntity::getCreateTaskTime,new Date()) .eq(OperMaintenancePlanEntity::getId,planEntity.getId())); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java index 9f2a033..5fc6b17 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java @@ -519,7 +519,6 @@ public class StationServiceImpl extends BaseServiceImpl getStationType(Integer serveType, List typeList, List departIdList,boolean make) { return this.list(new LambdaQueryWrapper() {{ - eq(StationEntity::getIsDeleted, 0); if (ObjectUtil.isNotEmpty(serveType)) { eq(StationEntity::getServeType, serveType); } diff --git a/hzims-service/pom.xml b/hzims-service/pom.xml index e69bc7f..e61f072 100644 --- a/hzims-service/pom.xml +++ b/hzims-service/pom.xml @@ -27,12 +27,6 @@ weather hzims-middle hzims-scheduled - base-info - digital-twin-display - dam-safety - video-image - water-quality - water-rain diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/controller/WorkAreaController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/controller/WorkAreaController.java new file mode 100644 index 0000000..b8de9d9 --- /dev/null +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/controller/WorkAreaController.java @@ -0,0 +1,63 @@ +package com.hnac.hzims.safeproduct.workarea.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hnac.hzims.safeproduct.workarea.entity.WorkArea; +import com.hnac.hzims.safeproduct.workarea.service.WorkAreaService; +import com.hnac.hzims.safeproduct.workarea.vo.WorkAreaQueryVo; +import lombok.RequiredArgsConstructor; +import org.springblade.core.tool.api.R; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RequiredArgsConstructor +@RestController +@RequestMapping("/workarea") +public class WorkAreaController { + + @Autowired + WorkAreaService workAreaService; + + /** + * 分页查询 + */ + @GetMapping("/listPage/{page}/{size}") + public R listPage(@PathVariable Long page, + @PathVariable Long size, + WorkAreaQueryVo workAreaQueryVo) { + Page pageParam = new Page<>(page, size); + IPage resultParams = + workAreaService.selectPage(pageParam, + workAreaQueryVo); + return R.data(resultParams); + } + + /** + * 新增工作区域数据 + */ + @PostMapping("/save") + public R save(@RequestBody WorkArea workArea) { + workAreaService.saveWorkArea(workArea); + return R.success("新增成功"); + } + + + /** + * 更新工作区域数据 + */ + @PutMapping("/update") + public R update(@RequestBody WorkArea workArea) { + workAreaService.updateWorkArea(workArea); + return R.success("修改成功"); + } + + + /** + * 删除工作区域数据 + */ + @DeleteMapping("/remove/{id}") + public R remove(@PathVariable Long id) { + workAreaService.removeById(id); + return R.success("删除成功"); + } +} diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/mapper/WorkAreaMapper.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/mapper/WorkAreaMapper.java new file mode 100644 index 0000000..f3e3dba --- /dev/null +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/mapper/WorkAreaMapper.java @@ -0,0 +1,7 @@ +package com.hnac.hzims.safeproduct.workarea.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hnac.hzims.safeproduct.workarea.entity.WorkArea; + +public interface WorkAreaMapper extends BaseMapper { +} diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/service/WorkAreaService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/service/WorkAreaService.java new file mode 100644 index 0000000..645db2d --- /dev/null +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/service/WorkAreaService.java @@ -0,0 +1,22 @@ +package com.hnac.hzims.safeproduct.workarea.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.hnac.hzims.safeproduct.workarea.entity.WorkArea; +import com.hnac.hzims.safeproduct.workarea.vo.WorkAreaQueryVo; + +public interface WorkAreaService extends IService { + + /** + * 分页查询 + * @param pageParam + * @param workAreaQueryVo + * @return + */ + IPage selectPage(Page pageParam, WorkAreaQueryVo workAreaQueryVo); + + void saveWorkArea(WorkArea workArea); + + void updateWorkArea(WorkArea workArea); +} diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/service/impl/WorkAreaServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/service/impl/WorkAreaServiceImpl.java new file mode 100644 index 0000000..52f07e5 --- /dev/null +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/service/impl/WorkAreaServiceImpl.java @@ -0,0 +1,93 @@ +package com.hnac.hzims.safeproduct.workarea.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hnac.hzims.safeproduct.workarea.entity.WorkArea; +import com.hnac.hzims.safeproduct.workarea.mapper.WorkAreaMapper; +import com.hnac.hzims.safeproduct.workarea.service.WorkAreaService; +import com.hnac.hzims.safeproduct.workarea.vo.WorkAreaQueryVo; +import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.tool.utils.ObjectUtil; +import org.springblade.system.cache.SysCache; +import org.springblade.system.entity.Dept; +import org.springblade.system.user.cache.UserCache; +import org.springblade.system.user.entity.User; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class WorkAreaServiceImpl extends ServiceImpl implements WorkAreaService { + + @Override + public IPage selectPage(Page pageParam, WorkAreaQueryVo workAreaQueryVo) { + String areaName = workAreaQueryVo.getAreaName(); + Long directOpId = workAreaQueryVo.getDirectOpId(); + Long leadOpId = workAreaQueryVo.getLeadOpId(); + Long departId = workAreaQueryVo.getDepartId(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotBlank(areaName)) { + queryWrapper.like(WorkArea::getAreaName,areaName); + } + if (ObjectUtil.isNotEmpty(directOpId)) { + queryWrapper.eq(WorkArea::getDirectOpId, directOpId); + } + if (ObjectUtil.isNotEmpty(leadOpId)) { + queryWrapper.eq(WorkArea::getLeadOpId, leadOpId); + } + if (ObjectUtil.isNotEmpty(departId)) { + queryWrapper.eq(WorkArea::getDepartId, departId); + } + IPage workAreaIPage = baseMapper.selectPage(pageParam, queryWrapper); + + //翻译 + List records = workAreaIPage.getRecords(); + records.stream().forEach(workArea -> { + User directOp = UserCache.getUser(workArea.getDirectOpId()); + String directOpName = directOp.getName(); + User leadOp = UserCache.getUser(workArea.getLeadOpId()); + String leadOpName = leadOp.getName(); + Dept dept = SysCache.getDept(workArea.getDepartId()); + String deptName = dept.getDeptName(); + workArea.setDirectOpName(directOpName); + workArea.setLeadOpName(leadOpName); + workArea.setDepartName(deptName); + }); + + return workAreaIPage; + } + + @Override + public void saveWorkArea(WorkArea workArea) { + checkOpAndDept(workArea); + this.save(workArea); + } + + @Override + public void updateWorkArea(WorkArea workArea) { + checkOpAndDept(workArea); + this.updateById(workArea); + } + + /** + * 校验员工id、部门id是否存在 + * @param workArea + */ + private void checkOpAndDept(WorkArea workArea) { + Long directOpId = workArea.getDirectOpId(); + Long leadOpId = workArea.getLeadOpId(); + Long departId = workArea.getDepartId(); + User user = UserCache.getUser(directOpId); + User user1 = UserCache.getUser(leadOpId); + if (user == null || user1 == null) { + throw new ServiceException("员工不存在，保存失败"); + } + Dept dept = SysCache.getDept(departId); + if (dept == null) { + throw new ServiceException("部门不存在，保存失败"); + } + } +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClient.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClient.java index e8a2dd7..5b93bba 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClient.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClient.java @@ -1,6 +1,7 @@ package com.hnac.hzims.ticket.allTicket.fegin; import com.google.common.collect.Lists; +import com.hnac.hzims.ticket.allTicket.dto.TicketStatisticDTO; import com.hnac.hzims.ticket.allTicket.service.TicketInfoStatisticService; import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; import com.hnac.hzims.ticket.allTicket.vo.DoublePassVO; @@ -10,6 +11,7 @@ import com.hnac.hzims.ticket.twoTicket.service.IFirstWorkTicketService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.StringUtil; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; @@ -70,4 +72,9 @@ public class TicketInfoAllClient implements ITicketInfoAllClient { public List getDoublePassQuantity(Map stationMap, LocalDateTime firstDateTime, LocalDateTime now) { return standardTicketInfoService.getDoublePassQuantity(stationMap,firstDateTime,now); } + + @Override + public R getTicketPassRate(TicketStatisticDTO ticketStatisticDTO) { + return null; + } } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/ITicketInfoAlService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/ITicketInfoAlService.java new file mode 100644 index 0000000..274fb7c --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/ITicketInfoAlService.java @@ -0,0 +1,4 @@ +package com.hnac.hzims.ticket.allTicket.service; + +public interface ITicketInfoAlService { +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/StandardTicketInfoMapper.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/StandardTicketInfoMapper.java index 704ce9f..cf61c9f 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/StandardTicketInfoMapper.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/StandardTicketInfoMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity; import com.hnac.hzims.ticket.standardTicket.vo.OperateTicketStatisticVO; +import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; import com.hnac.hzims.vo.SafeCheckStatisticVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -55,4 +56,6 @@ public interface StandardTicketInfoMapper extends UserDataScopeBaseMapper selectPages(Page searchPage, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List selectTicketList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/xml/StandardTicketInfoMapper.xml b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/xml/StandardTicketInfoMapper.xml index 6996bd2..8b7359a 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/xml/StandardTicketInfoMapper.xml +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/xml/StandardTicketInfoMapper.xml @@ -82,4 +82,9 @@ hzims_ticket_info_evaluate tie on sti.id = tie.ticket_id ${ew.customSqlSegment} + diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java index 4da8447..f67d3ea 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java @@ -28,16 +28,14 @@ import com.hnac.hzims.ticket.standardTicket.vo.OperateTicketStatisticVO; import com.hnac.hzims.ticket.standardTicket.vo.StandardTicketInfoVO; import com.hnac.hzims.ticket.standardTicket.vo.StandardTicketMeasureVO; import com.hnac.hzims.ticket.standardTicket.wrapper.StandardTicketInfoWrapper; -import com.hnac.hzims.ticket.twoTicket.vo.ticket.StandardTicketCountQueryVo; -import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountQueryVo; import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo; import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketMeasureVo; +import com.hnac.hzims.ticket.twoTicket.vo.ticket.StandardTicketCountQueryVo; import com.hnac.hzims.ticket.utils.ExcelUtil; import com.hnac.hzims.ticket.utils.PdfUtils; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; import com.hnac.hzims.ticket.workTicket.service.IWorkTicketInfoService; import com.hnac.hzims.ticket.workTicket.vo.TicketMonthVO; -import com.hnac.hzims.ticket.workTicket.vo.WorkTicketInfoVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -680,7 +678,7 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl operateTicketReportStatistic = this.baseMapper.getOperateTicketReportStatistic(startDate, endDate, deptIdList); if (CollectionUtil.isNotEmpty(operateTicketReportStatistic)) { //已完成数量 - int ticketInfoCompleteNum = operateTicketReportStatistic.stream().filter(ticket -> TicketConstants.StandardTicketStatusEnum.END.getStatus().equals(ticket.getStatus())).collect(Collectors.toList()).size(); + int ticketInfoCompleteNum = operateTicketReportStatistic.stream().filter(item -> "结束".equals(item.getFlowTaskName())).collect(Collectors.toList()).size(); //合格数量 int ticketInfoQualifiedNum = operateTicketReportStatistic.stream().filter(ticket -> Func.isNotEmpty(ticket.getEvaluation()) && 1 == ticket.getEvaluation().intValue()).collect(Collectors.toList()).size(); //计算合格率 diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java index b207705..441dad5 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java @@ -47,7 +47,6 @@ import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -58,7 +57,6 @@ import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** @@ -885,13 +883,12 @@ public class FirstWorkTicketServiceImpl extends BaseServiceImpl workTicketReportStatistic = this.baseMapper.getWorkTicketReportStatistic(startDate, endDate, deptIdList); if(CollectionUtil.isNotEmpty(workTicketReportStatistic)) { // 工作票完成数量 - int ticketInfoCompleteNum = workTicketReportStatistic.stream().filter( - ticket-> WorkTicketConstants.FirstWorkTicketStatusEnum.FINISH.getStatus().equals(ticket.getStatus()) - ).collect(Collectors.toList()).size(); + int ticketInfoCompleteNum = workTicketReportStatistic.stream().filter(item -> "结束".equals(item.getFlowTaskName())) + .collect(Collectors.toList()).size(); // 工作票未完成数量 int ticketInfoStartNum = workTicketReportStatistic.size() - ticketInfoCompleteNum; // 延期数量统计 - int ticketInfoDelayNum = workTicketReportStatistic.stream().filter(ticket -> Func.isNotEmpty(ticket.getDelayId())) + int ticketInfoDelayNum = workTicketReportStatistic.stream().filter(item -> "延期".equals(item.getInput())) .collect(Collectors.toList()).size(); // 合格数量统计 int ticketInfoQualifiedNum = workTicketReportStatistic.stream().filter(ticket -> Func.isNotEmpty(ticket.getEvaluation()) && ticket.getEvaluation().intValue() == 1) diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java index 8f931f5..1133d28 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java @@ -67,4 +67,7 @@ public interface WorkTicketInfoMapper extends UserDataScopeBaseMapper queryWrapper); List getWorkTicketBill(@Param("path") String path, @Param("startTime") String startTime, @Param("endTime") String endTime); + + @UserDataAuth + List selectTicketList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/xml/WorkTicketInfoMapper.xml b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/xml/WorkTicketInfoMapper.xml index 2d8173d..0261275 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/xml/WorkTicketInfoMapper.xml +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/xml/WorkTicketInfoMapper.xml @@ -106,4 +106,11 @@ GROUP BY info.EM_CODE,info.`type` + + + diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java index 67950c1..d8c63a5 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java @@ -178,4 +178,6 @@ public interface IWorkTicketInfoService extends BaseService listByTicketWithKeyword(Page entityPage, TicketCountQueryVo ticketCountQueryVo); + + } diff --git a/hzims-service/ticket/src/main/resources/application.yml b/hzims-service/ticket/src/main/resources/application.yml index 2af9d8e..a69f0f3 100644 --- a/hzims-service/ticket/src/main/resources/application.yml +++ b/hzims-service/ticket/src/main/resources/application.yml @@ -56,16 +56,3 @@ swagger: # flowId: sid-6358A80D-F592-4875-B281-A5B14A0EA39E # segment: 工作票延期 - -xxl: - job: - accessToken: '' - admin: - addresses: http://192.168.1.20:7009/xxl-job-admin - executor: - appname: hzims-ticket - ip: 192.168.1.3 - logpath: /data/applogs/xxl-job/jobhandler - logretentiondays: -1 - port: 28601 - diff --git a/hzims-service/ticket/src/main/resources/db/2.0.0.sql b/hzims-service/ticket/src/main/resources/db/2.0.0.sql index ecd99b4..ed7ad42 100644 --- a/hzims-service/ticket/src/main/resources/db/2.0.0.sql +++ b/hzims-service/ticket/src/main/resources/db/2.0.0.sql @@ -157,3 +157,17 @@ update hzims_standard_ticket_info set flow_task_name = '终止' where status = alter table hzims_ticket_count add wrong_ticket_num int null comment '错票数量'; alter table hzims_ticket_count add percent_pass_ticket varchar(50) null comment '合格率'; + +-- 两票开票视图 +create or replace view v_hzims_ticket_info as +select hzims_ticket_info.* from +(select `id`, `process_instance_id`, `type`, `company`, `code`, `task_type`, `task_id`, `task_name`, `plan_start_time`, + `plan_end_time`, `status`,`tenant_id`, `create_user`, `create_time`, `update_user`, `update_time`, `is_deleted`, + `create_dept`,`flow_description` + from hzims_work_ticket_info + union all + select `id`, `process_instance_id`, `ticket_type` type, `company`, `code`, `task_type`, `task_id`, `task_name`, + `start_time` plan_start_time, `end_time` plan_end_time, `status`,`tenant_id`, `create_user`, `create_time`, + `update_user`, `update_time`, `is_deleted`, `create_dept`,`flow_description` + from hzims_standard_ticket_info +) hzims_ticket_info where hzims_ticket_info.IS_DELETED = 0; diff --git a/hzims-service/video-image/pom.xml b/hzims-service/video-image/pom.xml deleted file mode 100644 index c7e85d8..0000000 --- a/hzims-service/video-image/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - 4.0.0 - - com.hnac.hzims - hzims-service - 4.0.0-SNAPSHOT - - - video-image - - - 8 - 8 - UTF-8 - - - - - - org.springblade - blade-core-boot - - - org.springblade - blade-starter-swagger - - - org.springblade - blade-starter-oss-all - - - com.baomidou - dynamic-datasource-spring-boot-starter - - - org.springblade - blade-core-test - test - - - org.springblade - blade-core-auto - compile - - - com.hnac.hzims - video-image-api - ${hzims.project.version} - - - - com.hikvision.ga - artemis-http-client - 1.1.2 - - - com.hnac.hzinfo.data - hzinfo-data-sdk - - - \ No newline at end of file diff --git a/hzims-service/video-image/src/main/java/com/hnac/hzims/videoimage/VideoImageApplication.java b/hzims-service/video-image/src/main/java/com/hnac/hzims/videoimage/VideoImageApplication.java deleted file mode 100644 index 60a47c8..0000000 --- a/hzims-service/video-image/src/main/java/com/hnac/hzims/videoimage/VideoImageApplication.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hnac.hzims.videoimage; - -import org.mybatis.spring.annotation.MapperScan; -import org.springblade.core.cloud.feign.EnableBladeFeign; -import org.springblade.core.launch.BladeApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.cloud.client.SpringCloudApplication; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.scheduling.annotation.EnableScheduling; - -@EnableBladeFeign(basePackages = {"org.springblade","com.hnac"}) -@SpringCloudApplication -@MapperScan("com.hnac.hzims.**.mapper.**") -@EnableScheduling -@ComponentScan(basePackages = {"com.hnac.hzims.*"}) -public class VideoImageApplication extends SpringBootServletInitializer { - public final static String APP_NAME = "video-image"; - - public static void main(String[] args) { -// System.setProperty("nacos.standalone", "true"); - BladeApplication.run(APP_NAME, VideoImageApplication.class, args); - } - - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - return BladeApplication.createSpringApplicationBuilder(builder, APP_NAME, VideoImageApplication.class); - } -} \ No newline at end of file diff --git a/hzims-service/video-image/src/main/java/com/hnac/hzims/videoimage/controller/HikVideoController.java b/hzims-service/video-image/src/main/java/com/hnac/hzims/videoimage/controller/HikVideoController.java deleted file mode 100644 index 75ba4fa..0000000 --- a/hzims-service/video-image/src/main/java/com/hnac/hzims/videoimage/controller/HikVideoController.java +++ /dev/null @@ -1,259 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package com.hnac.hzims.videoimage.controller; - - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.videoimage.entity.SysStationHikVideo; -import com.hnac.hzims.videoimage.entity.Video; -import com.hnac.hzims.videoimage.enums.CommandEnum; -import com.hnac.hzims.videoimage.manager.HikVideoManager; -import com.hnac.hzims.videoimage.service.IHikVideoService; -import com.hnac.hzims.videoimage.utils.SessionUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.tool.api.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; -import java.util.Map; - -@RestController -@Api(value = "视频-海康视频接口", tags = "视频-海康视频接口") -@RequestMapping({"/videoImage/hikVideo"}) -public class HikVideoController { - @Autowired - IHikVideoService hikVideoService; - @Autowired - HikVideoManager hikVideoManager; - - public HikVideoController() { - } - - @ApiOperation("删除站点下ID匹配的海康视频数据") - @RequestMapping( - value = {"/remove"}, - method = {RequestMethod.DELETE} - ) - public R deleteById( Long id) { - return R.data(this.hikVideoManager.deleteById(SessionUtil.getExistDeptId(), id)); - } - - - @RequestMapping(value = "save",method = {RequestMethod.POST}) - @ApiOperation("在当前站点下新增一条海康数据") - public R insert(@RequestBody SysStationHikVideo sysStationHikVideo) { - sysStationHikVideo.setIsDeleted(0); - this.hikVideoManager.insert(SessionUtil.getExistDeptId(), sysStationHikVideo); - return R.data(sysStationHikVideo); - } - - - @RequestMapping(value = "update",method = {RequestMethod.POST}) - @ApiOperation("在当前站点下更新一条海康数据") - public R update(@RequestBody SysStationHikVideo sysStationHikVideo) { - this.hikVideoManager.update(SessionUtil.getExistDeptId(), sysStationHikVideo); - return R.data(sysStationHikVideo); - } - - - @RequestMapping(value = {"/{pointId}/list/page"}, method = {RequestMethod.GET}) - @ApiOperation("获取当前站点下, 指定监测点及其子节点下的所有海康视频列表") - public R searchList(@ApiParam(value = "监测点ID",required = false) @PathVariable long pointId, - @ApiParam("是否启用") @RequestParam(required = false) Integer inUse, - @ApiParam("搜索文本") @RequestParam(required = false) String content, @ModelAttribute Query query) { - - IPage