diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoExample.java new file mode 100644 index 0000000..d34c601 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoExample.java @@ -0,0 +1,1241 @@ +package com.shxy.xymanager_common.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class TerminalPhotoExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TerminalPhotoExample() { + 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 andTermIdIsNull() { + addCriterion("term_id is null"); + return (Criteria) this; + } + + public Criteria andTermIdIsNotNull() { + addCriterion("term_id is not null"); + return (Criteria) this; + } + + public Criteria andTermIdEqualTo(Integer value) { + addCriterion("term_id =", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdNotEqualTo(Integer value) { + addCriterion("term_id <>", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdGreaterThan(Integer value) { + addCriterion("term_id >", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdGreaterThanOrEqualTo(Integer value) { + addCriterion("term_id >=", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdLessThan(Integer value) { + addCriterion("term_id <", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdLessThanOrEqualTo(Integer value) { + addCriterion("term_id <=", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdIn(List values) { + addCriterion("term_id in", values, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdNotIn(List values) { + addCriterion("term_id not in", values, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdBetween(Integer value1, Integer value2) { + addCriterion("term_id between", value1, value2, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdNotBetween(Integer value1, Integer value2) { + addCriterion("term_id not between", value1, value2, "termId"); + return (Criteria) this; + } + + public Criteria andChannelIdIsNull() { + addCriterion("channel_id is null"); + return (Criteria) this; + } + + public Criteria andChannelIdIsNotNull() { + addCriterion("channel_id is not null"); + return (Criteria) this; + } + + public Criteria andChannelIdEqualTo(Integer value) { + addCriterion("channel_id =", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdNotEqualTo(Integer value) { + addCriterion("channel_id <>", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdGreaterThan(Integer value) { + addCriterion("channel_id >", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdGreaterThanOrEqualTo(Integer value) { + addCriterion("channel_id >=", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdLessThan(Integer value) { + addCriterion("channel_id <", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdLessThanOrEqualTo(Integer value) { + addCriterion("channel_id <=", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdIn(List values) { + addCriterion("channel_id in", values, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdNotIn(List values) { + addCriterion("channel_id not in", values, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdBetween(Integer value1, Integer value2) { + addCriterion("channel_id between", value1, value2, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdNotBetween(Integer value1, Integer value2) { + addCriterion("channel_id not between", value1, value2, "channelId"); + return (Criteria) this; + } + + public Criteria andPresetIdIsNull() { + addCriterion("preset_id is null"); + return (Criteria) this; + } + + public Criteria andPresetIdIsNotNull() { + addCriterion("preset_id is not null"); + return (Criteria) this; + } + + public Criteria andPresetIdEqualTo(Integer value) { + addCriterion("preset_id =", value, "presetId"); + return (Criteria) this; + } + + public Criteria andPresetIdNotEqualTo(Integer value) { + addCriterion("preset_id <>", value, "presetId"); + return (Criteria) this; + } + + public Criteria andPresetIdGreaterThan(Integer value) { + addCriterion("preset_id >", value, "presetId"); + return (Criteria) this; + } + + public Criteria andPresetIdGreaterThanOrEqualTo(Integer value) { + addCriterion("preset_id >=", value, "presetId"); + return (Criteria) this; + } + + public Criteria andPresetIdLessThan(Integer value) { + addCriterion("preset_id <", value, "presetId"); + return (Criteria) this; + } + + public Criteria andPresetIdLessThanOrEqualTo(Integer value) { + addCriterion("preset_id <=", value, "presetId"); + return (Criteria) this; + } + + public Criteria andPresetIdIn(List values) { + addCriterion("preset_id in", values, "presetId"); + return (Criteria) this; + } + + public Criteria andPresetIdNotIn(List values) { + addCriterion("preset_id not in", values, "presetId"); + return (Criteria) this; + } + + public Criteria andPresetIdBetween(Integer value1, Integer value2) { + addCriterion("preset_id between", value1, value2, "presetId"); + return (Criteria) this; + } + + public Criteria andPresetIdNotBetween(Integer value1, Integer value2) { + addCriterion("preset_id not between", value1, value2, "presetId"); + return (Criteria) this; + } + + public Criteria andOrginalIdIsNull() { + addCriterion("orginal_id is null"); + return (Criteria) this; + } + + public Criteria andOrginalIdIsNotNull() { + addCriterion("orginal_id is not null"); + return (Criteria) this; + } + + public Criteria andOrginalIdEqualTo(Integer value) { + addCriterion("orginal_id =", value, "orginalId"); + return (Criteria) this; + } + + public Criteria andOrginalIdNotEqualTo(Integer value) { + addCriterion("orginal_id <>", value, "orginalId"); + return (Criteria) this; + } + + public Criteria andOrginalIdGreaterThan(Integer value) { + addCriterion("orginal_id >", value, "orginalId"); + return (Criteria) this; + } + + public Criteria andOrginalIdGreaterThanOrEqualTo(Integer value) { + addCriterion("orginal_id >=", value, "orginalId"); + return (Criteria) this; + } + + public Criteria andOrginalIdLessThan(Integer value) { + addCriterion("orginal_id <", value, "orginalId"); + return (Criteria) this; + } + + public Criteria andOrginalIdLessThanOrEqualTo(Integer value) { + addCriterion("orginal_id <=", value, "orginalId"); + return (Criteria) this; + } + + public Criteria andOrginalIdIn(List values) { + addCriterion("orginal_id in", values, "orginalId"); + return (Criteria) this; + } + + public Criteria andOrginalIdNotIn(List values) { + addCriterion("orginal_id not in", values, "orginalId"); + return (Criteria) this; + } + + public Criteria andOrginalIdBetween(Integer value1, Integer value2) { + addCriterion("orginal_id between", value1, value2, "orginalId"); + return (Criteria) this; + } + + public Criteria andOrginalIdNotBetween(Integer value1, Integer value2) { + addCriterion("orginal_id not between", value1, value2, "orginalId"); + return (Criteria) this; + } + + public Criteria andMediaTypeIsNull() { + addCriterion("media_type is null"); + return (Criteria) this; + } + + public Criteria andMediaTypeIsNotNull() { + addCriterion("media_type is not null"); + return (Criteria) this; + } + + public Criteria andMediaTypeEqualTo(Integer value) { + addCriterion("media_type =", value, "mediaType"); + return (Criteria) this; + } + + public Criteria andMediaTypeNotEqualTo(Integer value) { + addCriterion("media_type <>", value, "mediaType"); + return (Criteria) this; + } + + public Criteria andMediaTypeGreaterThan(Integer value) { + addCriterion("media_type >", value, "mediaType"); + return (Criteria) this; + } + + public Criteria andMediaTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("media_type >=", value, "mediaType"); + return (Criteria) this; + } + + public Criteria andMediaTypeLessThan(Integer value) { + addCriterion("media_type <", value, "mediaType"); + return (Criteria) this; + } + + public Criteria andMediaTypeLessThanOrEqualTo(Integer value) { + addCriterion("media_type <=", value, "mediaType"); + return (Criteria) this; + } + + public Criteria andMediaTypeIn(List values) { + addCriterion("media_type in", values, "mediaType"); + return (Criteria) this; + } + + public Criteria andMediaTypeNotIn(List values) { + addCriterion("media_type not in", values, "mediaType"); + return (Criteria) this; + } + + public Criteria andMediaTypeBetween(Integer value1, Integer value2) { + addCriterion("media_type between", value1, value2, "mediaType"); + return (Criteria) this; + } + + public Criteria andMediaTypeNotBetween(Integer value1, Integer value2) { + addCriterion("media_type not between", value1, value2, "mediaType"); + return (Criteria) this; + } + + public Criteria andPhotoTimeIsNull() { + addCriterion("photo_time is null"); + return (Criteria) this; + } + + public Criteria andPhotoTimeIsNotNull() { + addCriterion("photo_time is not null"); + return (Criteria) this; + } + + public Criteria andPhotoTimeEqualTo(Long value) { + addCriterion("photo_time =", value, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeNotEqualTo(Long value) { + addCriterion("photo_time <>", value, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeGreaterThan(Long value) { + addCriterion("photo_time >", value, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeGreaterThanOrEqualTo(Long value) { + addCriterion("photo_time >=", value, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeLessThan(Long value) { + addCriterion("photo_time <", value, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeLessThanOrEqualTo(Long value) { + addCriterion("photo_time <=", value, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeIn(List values) { + addCriterion("photo_time in", values, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeNotIn(List values) { + addCriterion("photo_time not in", values, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeBetween(Long value1, Long value2) { + addCriterion("photo_time between", value1, value2, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeNotBetween(Long value1, Long value2) { + addCriterion("photo_time not between", value1, value2, "photoTime"); + return (Criteria) this; + } + + public Criteria andPathIsNull() { + addCriterion("path is null"); + return (Criteria) this; + } + + public Criteria andPathIsNotNull() { + addCriterion("path is not null"); + return (Criteria) this; + } + + public Criteria andPathEqualTo(String value) { + addCriterion("path =", value, "path"); + return (Criteria) this; + } + + public Criteria andPathNotEqualTo(String value) { + addCriterion("path <>", value, "path"); + return (Criteria) this; + } + + public Criteria andPathGreaterThan(String value) { + addCriterion("path >", value, "path"); + return (Criteria) this; + } + + public Criteria andPathGreaterThanOrEqualTo(String value) { + addCriterion("path >=", value, "path"); + return (Criteria) this; + } + + public Criteria andPathLessThan(String value) { + addCriterion("path <", value, "path"); + return (Criteria) this; + } + + public Criteria andPathLessThanOrEqualTo(String value) { + addCriterion("path <=", value, "path"); + return (Criteria) this; + } + + public Criteria andPathLike(String value) { + addCriterion("path like", value, "path"); + return (Criteria) this; + } + + public Criteria andPathNotLike(String value) { + addCriterion("path not like", value, "path"); + return (Criteria) this; + } + + public Criteria andPathIn(List values) { + addCriterion("path in", values, "path"); + return (Criteria) this; + } + + public Criteria andPathNotIn(List values) { + addCriterion("path not in", values, "path"); + return (Criteria) this; + } + + public Criteria andPathBetween(String value1, String value2) { + addCriterion("path between", value1, value2, "path"); + return (Criteria) this; + } + + public Criteria andPathNotBetween(String value1, String value2) { + addCriterion("path not between", value1, value2, "path"); + return (Criteria) this; + } + + public Criteria andThumbIsNull() { + addCriterion("thumb is null"); + return (Criteria) this; + } + + public Criteria andThumbIsNotNull() { + addCriterion("thumb is not null"); + return (Criteria) this; + } + + public Criteria andThumbEqualTo(String value) { + addCriterion("thumb =", value, "thumb"); + return (Criteria) this; + } + + public Criteria andThumbNotEqualTo(String value) { + addCriterion("thumb <>", value, "thumb"); + return (Criteria) this; + } + + public Criteria andThumbGreaterThan(String value) { + addCriterion("thumb >", value, "thumb"); + return (Criteria) this; + } + + public Criteria andThumbGreaterThanOrEqualTo(String value) { + addCriterion("thumb >=", value, "thumb"); + return (Criteria) this; + } + + public Criteria andThumbLessThan(String value) { + addCriterion("thumb <", value, "thumb"); + return (Criteria) this; + } + + public Criteria andThumbLessThanOrEqualTo(String value) { + addCriterion("thumb <=", value, "thumb"); + return (Criteria) this; + } + + public Criteria andThumbLike(String value) { + addCriterion("thumb like", value, "thumb"); + return (Criteria) this; + } + + public Criteria andThumbNotLike(String value) { + addCriterion("thumb not like", value, "thumb"); + return (Criteria) this; + } + + public Criteria andThumbIn(List values) { + addCriterion("thumb in", values, "thumb"); + return (Criteria) this; + } + + public Criteria andThumbNotIn(List values) { + addCriterion("thumb not in", values, "thumb"); + return (Criteria) this; + } + + public Criteria andThumbBetween(String value1, String value2) { + addCriterion("thumb between", value1, value2, "thumb"); + return (Criteria) this; + } + + public Criteria andThumbNotBetween(String value1, String value2) { + addCriterion("thumb not between", value1, value2, "thumb"); + return (Criteria) this; + } + + public Criteria andRecvTimeIsNull() { + addCriterion("recv_time is null"); + return (Criteria) this; + } + + public Criteria andRecvTimeIsNotNull() { + addCriterion("recv_time is not null"); + return (Criteria) this; + } + + public Criteria andRecvTimeEqualTo(Long value) { + addCriterion("recv_time =", value, "recvTime"); + return (Criteria) this; + } + + public Criteria andRecvTimeNotEqualTo(Long value) { + addCriterion("recv_time <>", value, "recvTime"); + return (Criteria) this; + } + + public Criteria andRecvTimeGreaterThan(Long value) { + addCriterion("recv_time >", value, "recvTime"); + return (Criteria) this; + } + + public Criteria andRecvTimeGreaterThanOrEqualTo(Long value) { + addCriterion("recv_time >=", value, "recvTime"); + return (Criteria) this; + } + + public Criteria andRecvTimeLessThan(Long value) { + addCriterion("recv_time <", value, "recvTime"); + return (Criteria) this; + } + + public Criteria andRecvTimeLessThanOrEqualTo(Long value) { + addCriterion("recv_time <=", value, "recvTime"); + return (Criteria) this; + } + + public Criteria andRecvTimeIn(List values) { + addCriterion("recv_time in", values, "recvTime"); + return (Criteria) this; + } + + public Criteria andRecvTimeNotIn(List values) { + addCriterion("recv_time not in", values, "recvTime"); + return (Criteria) this; + } + + public Criteria andRecvTimeBetween(Long value1, Long value2) { + addCriterion("recv_time between", value1, value2, "recvTime"); + return (Criteria) this; + } + + public Criteria andRecvTimeNotBetween(Long value1, Long value2) { + addCriterion("recv_time not between", value1, value2, "recvTime"); + return (Criteria) this; + } + + public Criteria andRecvEndTimeIsNull() { + addCriterion("recv_end_time is null"); + return (Criteria) this; + } + + public Criteria andRecvEndTimeIsNotNull() { + addCriterion("recv_end_time is not null"); + return (Criteria) this; + } + + public Criteria andRecvEndTimeEqualTo(Long value) { + addCriterion("recv_end_time =", value, "recvEndTime"); + return (Criteria) this; + } + + public Criteria andRecvEndTimeNotEqualTo(Long value) { + addCriterion("recv_end_time <>", value, "recvEndTime"); + return (Criteria) this; + } + + public Criteria andRecvEndTimeGreaterThan(Long value) { + addCriterion("recv_end_time >", value, "recvEndTime"); + return (Criteria) this; + } + + public Criteria andRecvEndTimeGreaterThanOrEqualTo(Long value) { + addCriterion("recv_end_time >=", value, "recvEndTime"); + return (Criteria) this; + } + + public Criteria andRecvEndTimeLessThan(Long value) { + addCriterion("recv_end_time <", value, "recvEndTime"); + return (Criteria) this; + } + + public Criteria andRecvEndTimeLessThanOrEqualTo(Long value) { + addCriterion("recv_end_time <=", value, "recvEndTime"); + return (Criteria) this; + } + + public Criteria andRecvEndTimeIn(List values) { + addCriterion("recv_end_time in", values, "recvEndTime"); + return (Criteria) this; + } + + public Criteria andRecvEndTimeNotIn(List values) { + addCriterion("recv_end_time not in", values, "recvEndTime"); + return (Criteria) this; + } + + public Criteria andRecvEndTimeBetween(Long value1, Long value2) { + addCriterion("recv_end_time between", value1, value2, "recvEndTime"); + return (Criteria) this; + } + + public Criteria andRecvEndTimeNotBetween(Long value1, Long value2) { + addCriterion("recv_end_time not between", value1, value2, "recvEndTime"); + return (Criteria) this; + } + + public Criteria andWidthIsNull() { + addCriterion("width is null"); + return (Criteria) this; + } + + public Criteria andWidthIsNotNull() { + addCriterion("width is not null"); + return (Criteria) this; + } + + public Criteria andWidthEqualTo(Integer value) { + addCriterion("width =", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthNotEqualTo(Integer value) { + addCriterion("width <>", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthGreaterThan(Integer value) { + addCriterion("width >", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthGreaterThanOrEqualTo(Integer value) { + addCriterion("width >=", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthLessThan(Integer value) { + addCriterion("width <", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthLessThanOrEqualTo(Integer value) { + addCriterion("width <=", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthIn(List values) { + addCriterion("width in", values, "width"); + return (Criteria) this; + } + + public Criteria andWidthNotIn(List values) { + addCriterion("width not in", values, "width"); + return (Criteria) this; + } + + public Criteria andWidthBetween(Integer value1, Integer value2) { + addCriterion("width between", value1, value2, "width"); + return (Criteria) this; + } + + public Criteria andWidthNotBetween(Integer value1, Integer value2) { + addCriterion("width not between", value1, value2, "width"); + return (Criteria) this; + } + + public Criteria andHeightIsNull() { + addCriterion("height is null"); + return (Criteria) this; + } + + public Criteria andHeightIsNotNull() { + addCriterion("height is not null"); + return (Criteria) this; + } + + public Criteria andHeightEqualTo(Integer value) { + addCriterion("height =", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotEqualTo(Integer value) { + addCriterion("height <>", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightGreaterThan(Integer value) { + addCriterion("height >", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightGreaterThanOrEqualTo(Integer value) { + addCriterion("height >=", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightLessThan(Integer value) { + addCriterion("height <", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightLessThanOrEqualTo(Integer value) { + addCriterion("height <=", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightIn(List values) { + addCriterion("height in", values, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotIn(List values) { + addCriterion("height not in", values, "height"); + return (Criteria) this; + } + + public Criteria andHeightBetween(Integer value1, Integer value2) { + addCriterion("height between", value1, value2, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotBetween(Integer value1, Integer value2) { + addCriterion("height not between", value1, value2, "height"); + return (Criteria) this; + } + + public Criteria andFileSizeIsNull() { + addCriterion("file_size is null"); + return (Criteria) this; + } + + public Criteria andFileSizeIsNotNull() { + addCriterion("file_size is not null"); + return (Criteria) this; + } + + public Criteria andFileSizeEqualTo(Integer value) { + addCriterion("file_size =", value, "fileSize"); + return (Criteria) this; + } + + public Criteria andFileSizeNotEqualTo(Integer value) { + addCriterion("file_size <>", value, "fileSize"); + return (Criteria) this; + } + + public Criteria andFileSizeGreaterThan(Integer value) { + addCriterion("file_size >", value, "fileSize"); + return (Criteria) this; + } + + public Criteria andFileSizeGreaterThanOrEqualTo(Integer value) { + addCriterion("file_size >=", value, "fileSize"); + return (Criteria) this; + } + + public Criteria andFileSizeLessThan(Integer value) { + addCriterion("file_size <", value, "fileSize"); + return (Criteria) this; + } + + public Criteria andFileSizeLessThanOrEqualTo(Integer value) { + addCriterion("file_size <=", value, "fileSize"); + return (Criteria) this; + } + + public Criteria andFileSizeIn(List values) { + addCriterion("file_size in", values, "fileSize"); + return (Criteria) this; + } + + public Criteria andFileSizeNotIn(List values) { + addCriterion("file_size not in", values, "fileSize"); + return (Criteria) this; + } + + public Criteria andFileSizeBetween(Integer value1, Integer value2) { + addCriterion("file_size between", value1, value2, "fileSize"); + return (Criteria) this; + } + + public Criteria andFileSizeNotBetween(Integer value1, Integer value2) { + addCriterion("file_size not between", value1, value2, "fileSize"); + return (Criteria) this; + } + + public Criteria andFlagsIsNull() { + addCriterion("flags is null"); + return (Criteria) this; + } + + public Criteria andFlagsIsNotNull() { + addCriterion("flags is not null"); + return (Criteria) this; + } + + public Criteria andFlagsEqualTo(Byte value) { + addCriterion("flags =", value, "flags"); + return (Criteria) this; + } + + public Criteria andFlagsNotEqualTo(Byte value) { + addCriterion("flags <>", value, "flags"); + return (Criteria) this; + } + + public Criteria andFlagsGreaterThan(Byte value) { + addCriterion("flags >", value, "flags"); + return (Criteria) this; + } + + public Criteria andFlagsGreaterThanOrEqualTo(Byte value) { + addCriterion("flags >=", value, "flags"); + return (Criteria) this; + } + + public Criteria andFlagsLessThan(Byte value) { + addCriterion("flags <", value, "flags"); + return (Criteria) this; + } + + public Criteria andFlagsLessThanOrEqualTo(Byte value) { + addCriterion("flags <=", value, "flags"); + return (Criteria) this; + } + + public Criteria andFlagsIn(List values) { + addCriterion("flags in", values, "flags"); + return (Criteria) this; + } + + public Criteria andFlagsNotIn(List values) { + addCriterion("flags not in", values, "flags"); + return (Criteria) this; + } + + public Criteria andFlagsBetween(Byte value1, Byte value2) { + addCriterion("flags between", value1, value2, "flags"); + return (Criteria) this; + } + + public Criteria andFlagsNotBetween(Byte value1, Byte value2) { + addCriterion("flags not between", value1, value2, "flags"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andMarkIdIsNull() { + addCriterion("mark_id is null"); + return (Criteria) this; + } + + public Criteria andMarkIdIsNotNull() { + addCriterion("mark_id is not null"); + return (Criteria) this; + } + + public Criteria andMarkIdEqualTo(Integer value) { + addCriterion("mark_id =", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdNotEqualTo(Integer value) { + addCriterion("mark_id <>", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdGreaterThan(Integer value) { + addCriterion("mark_id >", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdGreaterThanOrEqualTo(Integer value) { + addCriterion("mark_id >=", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdLessThan(Integer value) { + addCriterion("mark_id <", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdLessThanOrEqualTo(Integer value) { + addCriterion("mark_id <=", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdIn(List values) { + addCriterion("mark_id in", values, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdNotIn(List values) { + addCriterion("mark_id not in", values, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdBetween(Integer value1, Integer value2) { + addCriterion("mark_id between", value1, value2, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdNotBetween(Integer value1, Integer value2) { + addCriterion("mark_id not between", value1, value2, "markId"); + 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/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPaths.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPaths.java new file mode 100644 index 0000000..c382317 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPaths.java @@ -0,0 +1,23 @@ +package com.shxy.xymanager_common.entity; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class TerminalPhotoMarkPaths implements Serializable { + private Integer id; + + private Integer markId; + + private Float x1; + + private Float y1; + + private Float x2; + + private Float y2; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPathsExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPathsExample.java new file mode 100644 index 0000000..16305d7 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPathsExample.java @@ -0,0 +1,560 @@ +package com.shxy.xymanager_common.entity; + +import java.util.ArrayList; +import java.util.List; + +public class TerminalPhotoMarkPathsExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TerminalPhotoMarkPathsExample() { + 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 andMarkIdIsNull() { + addCriterion("mark_id is null"); + return (Criteria) this; + } + + public Criteria andMarkIdIsNotNull() { + addCriterion("mark_id is not null"); + return (Criteria) this; + } + + public Criteria andMarkIdEqualTo(Integer value) { + addCriterion("mark_id =", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdNotEqualTo(Integer value) { + addCriterion("mark_id <>", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdGreaterThan(Integer value) { + addCriterion("mark_id >", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdGreaterThanOrEqualTo(Integer value) { + addCriterion("mark_id >=", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdLessThan(Integer value) { + addCriterion("mark_id <", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdLessThanOrEqualTo(Integer value) { + addCriterion("mark_id <=", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdIn(List values) { + addCriterion("mark_id in", values, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdNotIn(List values) { + addCriterion("mark_id not in", values, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdBetween(Integer value1, Integer value2) { + addCriterion("mark_id between", value1, value2, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdNotBetween(Integer value1, Integer value2) { + addCriterion("mark_id not between", value1, value2, "markId"); + return (Criteria) this; + } + + public Criteria andX1IsNull() { + addCriterion("x1 is null"); + return (Criteria) this; + } + + public Criteria andX1IsNotNull() { + addCriterion("x1 is not null"); + return (Criteria) this; + } + + public Criteria andX1EqualTo(Float value) { + addCriterion("x1 =", value, "x1"); + return (Criteria) this; + } + + public Criteria andX1NotEqualTo(Float value) { + addCriterion("x1 <>", value, "x1"); + return (Criteria) this; + } + + public Criteria andX1GreaterThan(Float value) { + addCriterion("x1 >", value, "x1"); + return (Criteria) this; + } + + public Criteria andX1GreaterThanOrEqualTo(Float value) { + addCriterion("x1 >=", value, "x1"); + return (Criteria) this; + } + + public Criteria andX1LessThan(Float value) { + addCriterion("x1 <", value, "x1"); + return (Criteria) this; + } + + public Criteria andX1LessThanOrEqualTo(Float value) { + addCriterion("x1 <=", value, "x1"); + return (Criteria) this; + } + + public Criteria andX1In(List values) { + addCriterion("x1 in", values, "x1"); + return (Criteria) this; + } + + public Criteria andX1NotIn(List values) { + addCriterion("x1 not in", values, "x1"); + return (Criteria) this; + } + + public Criteria andX1Between(Float value1, Float value2) { + addCriterion("x1 between", value1, value2, "x1"); + return (Criteria) this; + } + + public Criteria andX1NotBetween(Float value1, Float value2) { + addCriterion("x1 not between", value1, value2, "x1"); + return (Criteria) this; + } + + public Criteria andY1IsNull() { + addCriterion("y1 is null"); + return (Criteria) this; + } + + public Criteria andY1IsNotNull() { + addCriterion("y1 is not null"); + return (Criteria) this; + } + + public Criteria andY1EqualTo(Float value) { + addCriterion("y1 =", value, "y1"); + return (Criteria) this; + } + + public Criteria andY1NotEqualTo(Float value) { + addCriterion("y1 <>", value, "y1"); + return (Criteria) this; + } + + public Criteria andY1GreaterThan(Float value) { + addCriterion("y1 >", value, "y1"); + return (Criteria) this; + } + + public Criteria andY1GreaterThanOrEqualTo(Float value) { + addCriterion("y1 >=", value, "y1"); + return (Criteria) this; + } + + public Criteria andY1LessThan(Float value) { + addCriterion("y1 <", value, "y1"); + return (Criteria) this; + } + + public Criteria andY1LessThanOrEqualTo(Float value) { + addCriterion("y1 <=", value, "y1"); + return (Criteria) this; + } + + public Criteria andY1In(List values) { + addCriterion("y1 in", values, "y1"); + return (Criteria) this; + } + + public Criteria andY1NotIn(List values) { + addCriterion("y1 not in", values, "y1"); + return (Criteria) this; + } + + public Criteria andY1Between(Float value1, Float value2) { + addCriterion("y1 between", value1, value2, "y1"); + return (Criteria) this; + } + + public Criteria andY1NotBetween(Float value1, Float value2) { + addCriterion("y1 not between", value1, value2, "y1"); + return (Criteria) this; + } + + public Criteria andX2IsNull() { + addCriterion("x2 is null"); + return (Criteria) this; + } + + public Criteria andX2IsNotNull() { + addCriterion("x2 is not null"); + return (Criteria) this; + } + + public Criteria andX2EqualTo(Float value) { + addCriterion("x2 =", value, "x2"); + return (Criteria) this; + } + + public Criteria andX2NotEqualTo(Float value) { + addCriterion("x2 <>", value, "x2"); + return (Criteria) this; + } + + public Criteria andX2GreaterThan(Float value) { + addCriterion("x2 >", value, "x2"); + return (Criteria) this; + } + + public Criteria andX2GreaterThanOrEqualTo(Float value) { + addCriterion("x2 >=", value, "x2"); + return (Criteria) this; + } + + public Criteria andX2LessThan(Float value) { + addCriterion("x2 <", value, "x2"); + return (Criteria) this; + } + + public Criteria andX2LessThanOrEqualTo(Float value) { + addCriterion("x2 <=", value, "x2"); + return (Criteria) this; + } + + public Criteria andX2In(List values) { + addCriterion("x2 in", values, "x2"); + return (Criteria) this; + } + + public Criteria andX2NotIn(List values) { + addCriterion("x2 not in", values, "x2"); + return (Criteria) this; + } + + public Criteria andX2Between(Float value1, Float value2) { + addCriterion("x2 between", value1, value2, "x2"); + return (Criteria) this; + } + + public Criteria andX2NotBetween(Float value1, Float value2) { + addCriterion("x2 not between", value1, value2, "x2"); + return (Criteria) this; + } + + public Criteria andY2IsNull() { + addCriterion("y2 is null"); + return (Criteria) this; + } + + public Criteria andY2IsNotNull() { + addCriterion("y2 is not null"); + return (Criteria) this; + } + + public Criteria andY2EqualTo(Float value) { + addCriterion("y2 =", value, "y2"); + return (Criteria) this; + } + + public Criteria andY2NotEqualTo(Float value) { + addCriterion("y2 <>", value, "y2"); + return (Criteria) this; + } + + public Criteria andY2GreaterThan(Float value) { + addCriterion("y2 >", value, "y2"); + return (Criteria) this; + } + + public Criteria andY2GreaterThanOrEqualTo(Float value) { + addCriterion("y2 >=", value, "y2"); + return (Criteria) this; + } + + public Criteria andY2LessThan(Float value) { + addCriterion("y2 <", value, "y2"); + return (Criteria) this; + } + + public Criteria andY2LessThanOrEqualTo(Float value) { + addCriterion("y2 <=", value, "y2"); + return (Criteria) this; + } + + public Criteria andY2In(List values) { + addCriterion("y2 in", values, "y2"); + return (Criteria) this; + } + + public Criteria andY2NotIn(List values) { + addCriterion("y2 not in", values, "y2"); + return (Criteria) this; + } + + public Criteria andY2Between(Float value1, Float value2) { + addCriterion("y2 between", value1, value2, "y2"); + return (Criteria) this; + } + + public Criteria andY2NotBetween(Float value1, Float value2) { + addCriterion("y2 not between", value1, value2, "y2"); + 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/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarks.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarks.java new file mode 100644 index 0000000..7347f26 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarks.java @@ -0,0 +1,30 @@ +package com.shxy.xymanager_common.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class TerminalPhotoMarks implements Serializable { + private Integer id; + + private Integer termId; + + private Integer channelId; + + private Integer width; + + private Integer height; + + private String color; + + private Integer boderWidth; + + private Date createTime; + + private Date updateTime; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarksExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarksExample.java new file mode 100644 index 0000000..75f538b --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarksExample.java @@ -0,0 +1,751 @@ +package com.shxy.xymanager_common.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class TerminalPhotoMarksExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TerminalPhotoMarksExample() { + 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 andTermIdIsNull() { + addCriterion("term_id is null"); + return (Criteria) this; + } + + public Criteria andTermIdIsNotNull() { + addCriterion("term_id is not null"); + return (Criteria) this; + } + + public Criteria andTermIdEqualTo(Integer value) { + addCriterion("term_id =", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdNotEqualTo(Integer value) { + addCriterion("term_id <>", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdGreaterThan(Integer value) { + addCriterion("term_id >", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdGreaterThanOrEqualTo(Integer value) { + addCriterion("term_id >=", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdLessThan(Integer value) { + addCriterion("term_id <", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdLessThanOrEqualTo(Integer value) { + addCriterion("term_id <=", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdIn(List values) { + addCriterion("term_id in", values, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdNotIn(List values) { + addCriterion("term_id not in", values, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdBetween(Integer value1, Integer value2) { + addCriterion("term_id between", value1, value2, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdNotBetween(Integer value1, Integer value2) { + addCriterion("term_id not between", value1, value2, "termId"); + return (Criteria) this; + } + + public Criteria andChannelIdIsNull() { + addCriterion("channel_id is null"); + return (Criteria) this; + } + + public Criteria andChannelIdIsNotNull() { + addCriterion("channel_id is not null"); + return (Criteria) this; + } + + public Criteria andChannelIdEqualTo(Integer value) { + addCriterion("channel_id =", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdNotEqualTo(Integer value) { + addCriterion("channel_id <>", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdGreaterThan(Integer value) { + addCriterion("channel_id >", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdGreaterThanOrEqualTo(Integer value) { + addCriterion("channel_id >=", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdLessThan(Integer value) { + addCriterion("channel_id <", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdLessThanOrEqualTo(Integer value) { + addCriterion("channel_id <=", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdIn(List values) { + addCriterion("channel_id in", values, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdNotIn(List values) { + addCriterion("channel_id not in", values, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdBetween(Integer value1, Integer value2) { + addCriterion("channel_id between", value1, value2, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdNotBetween(Integer value1, Integer value2) { + addCriterion("channel_id not between", value1, value2, "channelId"); + return (Criteria) this; + } + + public Criteria andWidthIsNull() { + addCriterion("width is null"); + return (Criteria) this; + } + + public Criteria andWidthIsNotNull() { + addCriterion("width is not null"); + return (Criteria) this; + } + + public Criteria andWidthEqualTo(Integer value) { + addCriterion("width =", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthNotEqualTo(Integer value) { + addCriterion("width <>", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthGreaterThan(Integer value) { + addCriterion("width >", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthGreaterThanOrEqualTo(Integer value) { + addCriterion("width >=", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthLessThan(Integer value) { + addCriterion("width <", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthLessThanOrEqualTo(Integer value) { + addCriterion("width <=", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthIn(List values) { + addCriterion("width in", values, "width"); + return (Criteria) this; + } + + public Criteria andWidthNotIn(List values) { + addCriterion("width not in", values, "width"); + return (Criteria) this; + } + + public Criteria andWidthBetween(Integer value1, Integer value2) { + addCriterion("width between", value1, value2, "width"); + return (Criteria) this; + } + + public Criteria andWidthNotBetween(Integer value1, Integer value2) { + addCriterion("width not between", value1, value2, "width"); + return (Criteria) this; + } + + public Criteria andHeightIsNull() { + addCriterion("height is null"); + return (Criteria) this; + } + + public Criteria andHeightIsNotNull() { + addCriterion("height is not null"); + return (Criteria) this; + } + + public Criteria andHeightEqualTo(Integer value) { + addCriterion("height =", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotEqualTo(Integer value) { + addCriterion("height <>", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightGreaterThan(Integer value) { + addCriterion("height >", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightGreaterThanOrEqualTo(Integer value) { + addCriterion("height >=", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightLessThan(Integer value) { + addCriterion("height <", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightLessThanOrEqualTo(Integer value) { + addCriterion("height <=", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightIn(List values) { + addCriterion("height in", values, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotIn(List values) { + addCriterion("height not in", values, "height"); + return (Criteria) this; + } + + public Criteria andHeightBetween(Integer value1, Integer value2) { + addCriterion("height between", value1, value2, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotBetween(Integer value1, Integer value2) { + addCriterion("height not between", value1, value2, "height"); + return (Criteria) this; + } + + public Criteria andColorIsNull() { + addCriterion("color is null"); + return (Criteria) this; + } + + public Criteria andColorIsNotNull() { + addCriterion("color is not null"); + return (Criteria) this; + } + + public Criteria andColorEqualTo(String value) { + addCriterion("color =", value, "color"); + return (Criteria) this; + } + + public Criteria andColorNotEqualTo(String value) { + addCriterion("color <>", value, "color"); + return (Criteria) this; + } + + public Criteria andColorGreaterThan(String value) { + addCriterion("color >", value, "color"); + return (Criteria) this; + } + + public Criteria andColorGreaterThanOrEqualTo(String value) { + addCriterion("color >=", value, "color"); + return (Criteria) this; + } + + public Criteria andColorLessThan(String value) { + addCriterion("color <", value, "color"); + return (Criteria) this; + } + + public Criteria andColorLessThanOrEqualTo(String value) { + addCriterion("color <=", value, "color"); + return (Criteria) this; + } + + public Criteria andColorLike(String value) { + addCriterion("color like", value, "color"); + return (Criteria) this; + } + + public Criteria andColorNotLike(String value) { + addCriterion("color not like", value, "color"); + return (Criteria) this; + } + + public Criteria andColorIn(List values) { + addCriterion("color in", values, "color"); + return (Criteria) this; + } + + public Criteria andColorNotIn(List values) { + addCriterion("color not in", values, "color"); + return (Criteria) this; + } + + public Criteria andColorBetween(String value1, String value2) { + addCriterion("color between", value1, value2, "color"); + return (Criteria) this; + } + + public Criteria andColorNotBetween(String value1, String value2) { + addCriterion("color not between", value1, value2, "color"); + return (Criteria) this; + } + + public Criteria andBoderWidthIsNull() { + addCriterion("boder_width is null"); + return (Criteria) this; + } + + public Criteria andBoderWidthIsNotNull() { + addCriterion("boder_width is not null"); + return (Criteria) this; + } + + public Criteria andBoderWidthEqualTo(Integer value) { + addCriterion("boder_width =", value, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthNotEqualTo(Integer value) { + addCriterion("boder_width <>", value, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthGreaterThan(Integer value) { + addCriterion("boder_width >", value, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthGreaterThanOrEqualTo(Integer value) { + addCriterion("boder_width >=", value, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthLessThan(Integer value) { + addCriterion("boder_width <", value, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthLessThanOrEqualTo(Integer value) { + addCriterion("boder_width <=", value, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthIn(List values) { + addCriterion("boder_width in", values, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthNotIn(List values) { + addCriterion("boder_width not in", values, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthBetween(Integer value1, Integer value2) { + addCriterion("boder_width between", value1, value2, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthNotBetween(Integer value1, Integer value2) { + addCriterion("boder_width not between", value1, value2, "boderWidth"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + 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/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java index 5a24e12..8ab3dac 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java @@ -16,35 +16,35 @@ import java.util.List; @ApiModel(value = "获取绘制信息", description = "获取绘制信息") public class PhotoMarkModel implements Serializable { - @ApiModelProperty(value = "通道编号", example = "213") - private Integer termId; + @ApiModelProperty(value = "通道编号", example = "213") + private Integer termId; - @ApiModelProperty(value = "绘制ID", example = "213") - private Integer markId; + @ApiModelProperty(value = "绘制ID", example = "213") + private Integer markId; - @NotNull(message = "通道编号") - @ApiModelProperty(value = "通道编号", example = "213") - private Integer channelId; + @NotNull(message = "通道编号") + @ApiModelProperty(value = "通道编号", example = "213") + private Integer channelId; - @ApiModelProperty(value = "参考图片宽", example = "213") - private Integer width; + @ApiModelProperty(value = "参考图片宽", example = "213") + private Integer width; - @ApiModelProperty(value = "参考图片高", example = "213") - private Integer height; + @ApiModelProperty(value = "参考图片高", example = "213") + private Integer height; - @ApiModelProperty(value = "线条颜色", example = "213") - private String color; + @ApiModelProperty(value = "线条颜色", example = "213") + private String color; - @ApiModelProperty(value = "线条宽度", example = "213") - private Short boderWidth; + @ApiModelProperty(value = "线条宽度", example = "213") + private Integer boderWidth; - @ApiModelProperty(value = "图片地址", example = "213") - private String path; + @ApiModelProperty(value = "图片地址", example = "213") + private String path; - @ApiModelProperty(value = "通道编号和名称", example = "213") - private List list; + @ApiModelProperty(value = "通道编号和名称", example = "213") + private List list; - @ApiModelProperty(value = "", example = "0--关 1---开启") - private Integer markEnable; + @ApiModelProperty(value = "", example = "0--关 1---开启") + private Integer markEnable; } diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java index 7141cbb..04dea40 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java @@ -3,6 +3,7 @@ package com.shxy.xymanager_dao.dao; import com.shxy.xymanager_common.dto.*; import com.shxy.xymanager_common.entity.Lines; import com.shxy.xymanager_common.entity.TerminalPhoto; +import com.shxy.xymanager_common.entity.TerminalPhotoExample; import com.shxy.xymanager_common.vo.*; import org.apache.ibatis.annotations.Param; @@ -20,18 +21,6 @@ public interface TerminalPhotoDao { List selectPhotoListByTermList(@Param("terminalidlist") List terminalid, @Param("channelidlist") List channelid, @Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime); - int deleteByPrimaryKey(Long id); - - int insert(TerminalPhoto record); - - int insertSelective(TerminalPhoto record); - - TerminalPhoto selectByPrimaryKey(Long id); - - int updateByPrimaryKeySelective(TerminalPhoto record); - - int updateByPrimaryKey(TerminalPhoto record); - TerminalPhoto getLatestPhoto(@Param("termId") Integer termId); List getLatestPhotoByTermidAndChannelid(@Param("termId") Integer termId, @Param("channelId") Integer channelId); @@ -48,30 +37,41 @@ public interface TerminalPhotoDao { PhotoParamsDto selectPhotoParams(ReturnedPhotoParamsVo vo); - String selectCmdIdById(Integer termId); + void deleteByMarkId(@Param("markId") Integer markId); - Integer updateOrInsertParams(PhotoParamsVo vo); + Integer addPhotoMark(PhotoMarkVo vo); - BigInteger getLatestPhotoParam(Integer termId); + Integer addPhotoMarkPath(@Param("list") List list, @Param("markId") Integer id); + void updatePhotoMark(PhotoMarkVo vo); - void deleteByMarkId(@Param("markId") Integer markId); + PhotoMarkDto selectPhotoMark(MarkReqVo vo); + PhotoMarkDto selectPhotoWithoutPic(MarkReqVo vo); - Integer addPhotoMark(PhotoMarkVo vo); - Integer addPhotoMarkPath(@Param("list") List list, @Param("markId") Integer id); + int deletePicList(@Param("list") List list); - void updatePhotoMark(PhotoMarkVo vo); + long countByExample(TerminalPhotoExample example); + int deleteByExample(TerminalPhotoExample example); - void updatePhotoMarkId(PhotoMarkVo vo); + int deleteByPrimaryKey(Long id); + int insert(TerminalPhoto record); - PhotoMarkDto selectPhotoMark(MarkReqVo vo); + int insertSelective(TerminalPhoto record); - PhotoMarkDto selectPhotoWithoutPic(MarkReqVo vo); + List selectByExample(TerminalPhotoExample example); + TerminalPhoto selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") TerminalPhoto record, @Param("example") TerminalPhotoExample example); + + int updateByExample(@Param("record") TerminalPhoto record, @Param("example") TerminalPhotoExample example); + + int updateByPrimaryKeySelective(TerminalPhoto record); + + int updateByPrimaryKey(TerminalPhoto record); - int deletePicList(@Param("list") List list); } \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarkPathsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarkPathsDao.java new file mode 100644 index 0000000..be21c3f --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarkPathsDao.java @@ -0,0 +1,30 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.entity.TerminalPhotoMarkPaths; +import com.shxy.xymanager_common.entity.TerminalPhotoMarkPathsExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface TerminalPhotoMarkPathsDao { + long countByExample(TerminalPhotoMarkPathsExample example); + + int deleteByExample(TerminalPhotoMarkPathsExample example); + + int deleteByPrimaryKey(Integer id); + + int insert(TerminalPhotoMarkPaths record); + + int insertSelective(TerminalPhotoMarkPaths record); + + List selectByExample(TerminalPhotoMarkPathsExample example); + + TerminalPhotoMarkPaths selectByPrimaryKey(Integer id); + + int updateByExampleSelective(@Param("record") TerminalPhotoMarkPaths record, @Param("example") TerminalPhotoMarkPathsExample example); + + int updateByExample(@Param("record") TerminalPhotoMarkPaths record, @Param("example") TerminalPhotoMarkPathsExample example); + + int updateByPrimaryKeySelective(TerminalPhotoMarkPaths record); + + int updateByPrimaryKey(TerminalPhotoMarkPaths record); +} \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarksDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarksDao.java new file mode 100644 index 0000000..24db8ae --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarksDao.java @@ -0,0 +1,30 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.entity.TerminalPhotoMarks; +import com.shxy.xymanager_common.entity.TerminalPhotoMarksExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface TerminalPhotoMarksDao { + long countByExample(TerminalPhotoMarksExample example); + + int deleteByExample(TerminalPhotoMarksExample example); + + int deleteByPrimaryKey(Integer id); + + int insert(TerminalPhotoMarks record); + + int insertSelective(TerminalPhotoMarks record); + + List selectByExample(TerminalPhotoMarksExample example); + + TerminalPhotoMarks selectByPrimaryKey(Integer id); + + int updateByExampleSelective(@Param("record") TerminalPhotoMarks record, @Param("example") TerminalPhotoMarksExample example); + + int updateByExample(@Param("record") TerminalPhotoMarks record, @Param("example") TerminalPhotoMarksExample example); + + int updateByPrimaryKeySelective(TerminalPhotoMarks record); + + int updateByPrimaryKey(TerminalPhotoMarks record); +} \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/generatorConfig.xml b/xymanager_dao/src/main/resources/generatorConfig.xml index 92888a1..40acf00 100644 --- a/xymanager_dao/src/main/resources/generatorConfig.xml +++ b/xymanager_dao/src/main/resources/generatorConfig.xml @@ -253,12 +253,26 @@ - + + + + + + +
+ +
+ +
+ \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml index 2adc569..59c5f9c 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml @@ -91,6 +91,64 @@ + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + id, term_id, channel_id,orginal_id, media_type,preset_id, width, height, file_size, photo_time, recv_time, path, thumb,create_time @@ -410,19 +468,6 @@ where tip.term_id = #{termId,jdbcType=INTEGER} and tip.channel_id = #{channelId,jdbcType=INTEGER} - - - @@ -432,13 +477,6 @@ (termId,color,resolution,luminance,saturation) - @@ -551,4 +589,21 @@ + + + + \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarkPathsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarkPathsDao.xml new file mode 100644 index 0000000..279c622 --- /dev/null +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarkPathsDao.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, mark_id, x1, y1, x2, y2 + + + + + delete from terminal_photo_mark_paths + where id = #{id,jdbcType=INTEGER} + + + delete from terminal_photo_mark_paths + + + + + + insert into terminal_photo_mark_paths (id, mark_id, x1, + y1, x2, y2) + values (#{id,jdbcType=INTEGER}, #{markId,jdbcType=INTEGER}, #{x1,jdbcType=REAL}, + #{y1,jdbcType=REAL}, #{x2,jdbcType=REAL}, #{y2,jdbcType=REAL}) + + + insert into terminal_photo_mark_paths + + + id, + + + mark_id, + + + x1, + + + y1, + + + x2, + + + y2, + + + + + #{id,jdbcType=INTEGER}, + + + #{markId,jdbcType=INTEGER}, + + + #{x1,jdbcType=REAL}, + + + #{y1,jdbcType=REAL}, + + + #{x2,jdbcType=REAL}, + + + #{y2,jdbcType=REAL}, + + + + + + update terminal_photo_mark_paths + + + id = #{record.id,jdbcType=INTEGER}, + + + mark_id = #{record.markId,jdbcType=INTEGER}, + + + x1 = #{record.x1,jdbcType=REAL}, + + + y1 = #{record.y1,jdbcType=REAL}, + + + x2 = #{record.x2,jdbcType=REAL}, + + + y2 = #{record.y2,jdbcType=REAL}, + + + + + + + + update terminal_photo_mark_paths + set id = #{record.id,jdbcType=INTEGER}, + mark_id = #{record.markId,jdbcType=INTEGER}, + x1 = #{record.x1,jdbcType=REAL}, + y1 = #{record.y1,jdbcType=REAL}, + x2 = #{record.x2,jdbcType=REAL}, + y2 = #{record.y2,jdbcType=REAL} + + + + + + update terminal_photo_mark_paths + + + mark_id = #{markId,jdbcType=INTEGER}, + + + x1 = #{x1,jdbcType=REAL}, + + + y1 = #{y1,jdbcType=REAL}, + + + x2 = #{x2,jdbcType=REAL}, + + + y2 = #{y2,jdbcType=REAL}, + + + where id = #{id,jdbcType=INTEGER} + + + update terminal_photo_mark_paths + set mark_id = #{markId,jdbcType=INTEGER}, + x1 = #{x1,jdbcType=REAL}, + y1 = #{y1,jdbcType=REAL}, + x2 = #{x2,jdbcType=REAL}, + y2 = #{y2,jdbcType=REAL} + where id = #{id,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarksDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarksDao.xml new file mode 100644 index 0000000..b5154be --- /dev/null +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarksDao.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, term_id, channel_id, width, height, color, boder_width, create_time, update_time + + + + + delete from terminal_photo_marks + where id = #{id,jdbcType=INTEGER} + + + delete from terminal_photo_marks + + + + + + insert into terminal_photo_marks (id, term_id, channel_id, + width, height, color, + boder_width, create_time, update_time + ) + values (#{id,jdbcType=INTEGER}, #{termId,jdbcType=INTEGER}, #{channelId,jdbcType=TINYINT}, + #{width,jdbcType=INTEGER}, #{height,jdbcType=INTEGER}, #{color,jdbcType=VARCHAR}, + #{boderWidth,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} + ) + + + insert into terminal_photo_marks + + + id, + + + term_id, + + + channel_id, + + + width, + + + height, + + + color, + + + boder_width, + + + create_time, + + + update_time, + + + + + #{id,jdbcType=INTEGER}, + + + #{termId,jdbcType=INTEGER}, + + + #{channelId,jdbcType=TINYINT}, + + + #{width,jdbcType=INTEGER}, + + + #{height,jdbcType=INTEGER}, + + + #{color,jdbcType=VARCHAR}, + + + #{boderWidth,jdbcType=TINYINT}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + + + + update terminal_photo_marks + + + id = #{record.id,jdbcType=INTEGER}, + + + term_id = #{record.termId,jdbcType=INTEGER}, + + + channel_id = #{record.channelId,jdbcType=TINYINT}, + + + width = #{record.width,jdbcType=INTEGER}, + + + height = #{record.height,jdbcType=INTEGER}, + + + color = #{record.color,jdbcType=VARCHAR}, + + + boder_width = #{record.boderWidth,jdbcType=TINYINT}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + + + + + + update terminal_photo_marks + set id = #{record.id,jdbcType=INTEGER}, + term_id = #{record.termId,jdbcType=INTEGER}, + channel_id = #{record.channelId,jdbcType=TINYINT}, + width = #{record.width,jdbcType=INTEGER}, + height = #{record.height,jdbcType=INTEGER}, + color = #{record.color,jdbcType=VARCHAR}, + boder_width = #{record.boderWidth,jdbcType=TINYINT}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP} + + + + + + update terminal_photo_marks + + + term_id = #{termId,jdbcType=INTEGER}, + + + channel_id = #{channelId,jdbcType=TINYINT}, + + + width = #{width,jdbcType=INTEGER}, + + + height = #{height,jdbcType=INTEGER}, + + + color = #{color,jdbcType=VARCHAR}, + + + boder_width = #{boderWidth,jdbcType=TINYINT}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=INTEGER} + + + update terminal_photo_marks + set term_id = #{termId,jdbcType=INTEGER}, + channel_id = #{channelId,jdbcType=TINYINT}, + width = #{width,jdbcType=INTEGER}, + height = #{height,jdbcType=INTEGER}, + color = #{color,jdbcType=VARCHAR}, + boder_width = #{boderWidth,jdbcType=TINYINT}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index 62f77fa..b614adc 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -59,6 +59,12 @@ public class TerminalServiceImpl implements TerminalService { @Autowired TerminalPhotoDao terminalPhotoDao; + @Autowired + TerminalPhotoMarkPathsDao terminalPhotoMarkPathsDao; + + @Autowired + TerminalPhotoMarksDao terminalPhotoMarksDao; + @Autowired DyLevelDao dyLevelDao; @@ -469,6 +475,8 @@ public class TerminalServiceImpl implements TerminalService { @Override public ServiceBody getCoordinate(String requestIp, MarkReqVo vo) { + Integer termId = vo.getTermId(); + Integer channelId = vo.getChannelId(); Map globalParams = cacheService.getGolobalMap(); String s = globalParams.get(GloableParamsType.ImgMark.value()); Integer integer = null; @@ -478,21 +486,51 @@ public class TerminalServiceImpl implements TerminalService { integer = Integer.valueOf(s); } PhotoMarkModel model = new PhotoMarkModel(); + model.setTermId(termId); + model.setChannelId(channelId); model.setMarkEnable(integer); - PhotoMarkDto dto = null; if (vo.getNeedPic() == 0) { - dto = terminalPhotoDao.selectPhotoMark(vo); - if (null != dto && StringUtils.isNotBlank(dto.getPath())) { - String photoPath = TerminalUtils.getPhotoPath(0, requestIp, dto.getPath()); - dto.setPath(photoPath); + PageUtils.SetPage(1, 1); + TerminalPhotoExample example = new TerminalPhotoExample(); + TerminalPhotoExample.Criteria criteria = example.createCriteria(); + criteria.andChannelIdEqualTo(channelId).andTermIdEqualTo(termId).andMediaTypeEqualTo(CommonStatus.DELETE.value()); + example.setOrderByClause("id desc"); + List photoList = terminalPhotoDao.selectByExample(example); + if (CollectionUtil.isNotEmpty(photoList)) { + TerminalPhoto terminalPhoto = photoList.get(0); + if (null != terminalPhoto && StringUtils.isNotBlank(terminalPhoto.getPath())) { + String photoPath = TerminalUtils.getPhotoPath(0, requestIp, terminalPhoto.getPath()); + model.setPath(photoPath); + } } - } else { - dto = terminalPhotoDao.selectPhotoWithoutPic(vo); } - - if (null != dto) { - BeanUtils.copyProperties(dto, model); + ArrayList list = new ArrayList<>(); + TerminalPhotoMarksExample example1 = new TerminalPhotoMarksExample(); + example1.createCriteria().andTermIdEqualTo(termId).andChannelIdEqualTo(channelId); + List terminalPhotoMarks = terminalPhotoMarksDao.selectByExample(example1); + if (CollectionUtil.isNotEmpty(terminalPhotoMarks)) { + TerminalPhotoMarks terminalPhotoMarks1 = terminalPhotoMarks.get(0); + Integer marks1Id = terminalPhotoMarks1.getId(); + model.setMarkId(marks1Id); + model.setBoderWidth(terminalPhotoMarks1.getBoderWidth()); + model.setColor(terminalPhotoMarks1.getColor()); + model.setHeight(terminalPhotoMarks1.getHeight()); + model.setWidth(terminalPhotoMarks1.getWidth()); + TerminalPhotoMarkPathsExample example2 = new TerminalPhotoMarkPathsExample(); + example2.createCriteria().andMarkIdEqualTo(marks1Id); + List terminalPhotoMarkPaths = terminalPhotoMarkPathsDao.selectByExample(example2); + if (CollectionUtil.isNotEmpty(terminalPhotoMarkPaths)) { + for (TerminalPhotoMarkPaths item : terminalPhotoMarkPaths) { + TermChannelCoordinateDto termChannelCoordinateDto = new TermChannelCoordinateDto(); + termChannelCoordinateDto.setX1(item.getX1()); + termChannelCoordinateDto.setX2(item.getX2()); + termChannelCoordinateDto.setY1(item.getY1()); + termChannelCoordinateDto.setY2(item.getY2()); + list.add(termChannelCoordinateDto); + } + } } + model.setList(list); return Asserts.success(model); } @@ -690,7 +728,7 @@ public class TerminalServiceImpl implements TerminalService { public ServiceBody addFavorList(FavorVo vo) { Integer id = vo.getId(); Integer termid = vo.getTermid(); - terminalsDao.updateFavor(id,termid); + terminalsDao.updateFavor(id, termid); return Asserts.success("修改成功"); }