diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/Question.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/Question.java index c9221592..4c0c06db 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/Question.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/Question.java @@ -1,6 +1,7 @@ package com.ccsens.tcm.bean.po; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; public class Question implements Serializable { @@ -16,6 +17,10 @@ public class Question implements Serializable { private Byte type; + private BigDecimal referenceLower; + + private BigDecimal referenceUpper; + private Long relevanceOptionId; private Byte searchCriteria; @@ -80,6 +85,22 @@ public class Question implements Serializable { this.type = type; } + public BigDecimal getReferenceLower() { + return referenceLower; + } + + public void setReferenceLower(BigDecimal referenceLower) { + this.referenceLower = referenceLower; + } + + public BigDecimal getReferenceUpper() { + return referenceUpper; + } + + public void setReferenceUpper(BigDecimal referenceUpper) { + this.referenceUpper = referenceUpper; + } + public Long getRelevanceOptionId() { return relevanceOptionId; } @@ -148,6 +169,8 @@ public class Question implements Serializable { sb.append(", sort=").append(sort); sb.append(", units=").append(units); sb.append(", type=").append(type); + sb.append(", referenceLower=").append(referenceLower); + sb.append(", referenceUpper=").append(referenceUpper); sb.append(", relevanceOptionId=").append(relevanceOptionId); sb.append(", searchCriteria=").append(searchCriteria); sb.append(", remark=").append(remark); diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionExample.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionExample.java index d90f968d..907ca748 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionExample.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionExample.java @@ -1,5 +1,6 @@ package com.ccsens.tcm.bean.po; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -495,6 +496,126 @@ public class QuestionExample { return (Criteria) this; } + public Criteria andReferenceLowerIsNull() { + addCriterion("reference_lower is null"); + return (Criteria) this; + } + + public Criteria andReferenceLowerIsNotNull() { + addCriterion("reference_lower is not null"); + return (Criteria) this; + } + + public Criteria andReferenceLowerEqualTo(BigDecimal value) { + addCriterion("reference_lower =", value, "referenceLower"); + return (Criteria) this; + } + + public Criteria andReferenceLowerNotEqualTo(BigDecimal value) { + addCriterion("reference_lower <>", value, "referenceLower"); + return (Criteria) this; + } + + public Criteria andReferenceLowerGreaterThan(BigDecimal value) { + addCriterion("reference_lower >", value, "referenceLower"); + return (Criteria) this; + } + + public Criteria andReferenceLowerGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("reference_lower >=", value, "referenceLower"); + return (Criteria) this; + } + + public Criteria andReferenceLowerLessThan(BigDecimal value) { + addCriterion("reference_lower <", value, "referenceLower"); + return (Criteria) this; + } + + public Criteria andReferenceLowerLessThanOrEqualTo(BigDecimal value) { + addCriterion("reference_lower <=", value, "referenceLower"); + return (Criteria) this; + } + + public Criteria andReferenceLowerIn(List values) { + addCriterion("reference_lower in", values, "referenceLower"); + return (Criteria) this; + } + + public Criteria andReferenceLowerNotIn(List values) { + addCriterion("reference_lower not in", values, "referenceLower"); + return (Criteria) this; + } + + public Criteria andReferenceLowerBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("reference_lower between", value1, value2, "referenceLower"); + return (Criteria) this; + } + + public Criteria andReferenceLowerNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("reference_lower not between", value1, value2, "referenceLower"); + return (Criteria) this; + } + + public Criteria andReferenceUpperIsNull() { + addCriterion("reference_upper is null"); + return (Criteria) this; + } + + public Criteria andReferenceUpperIsNotNull() { + addCriterion("reference_upper is not null"); + return (Criteria) this; + } + + public Criteria andReferenceUpperEqualTo(BigDecimal value) { + addCriterion("reference_upper =", value, "referenceUpper"); + return (Criteria) this; + } + + public Criteria andReferenceUpperNotEqualTo(BigDecimal value) { + addCriterion("reference_upper <>", value, "referenceUpper"); + return (Criteria) this; + } + + public Criteria andReferenceUpperGreaterThan(BigDecimal value) { + addCriterion("reference_upper >", value, "referenceUpper"); + return (Criteria) this; + } + + public Criteria andReferenceUpperGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("reference_upper >=", value, "referenceUpper"); + return (Criteria) this; + } + + public Criteria andReferenceUpperLessThan(BigDecimal value) { + addCriterion("reference_upper <", value, "referenceUpper"); + return (Criteria) this; + } + + public Criteria andReferenceUpperLessThanOrEqualTo(BigDecimal value) { + addCriterion("reference_upper <=", value, "referenceUpper"); + return (Criteria) this; + } + + public Criteria andReferenceUpperIn(List values) { + addCriterion("reference_upper in", values, "referenceUpper"); + return (Criteria) this; + } + + public Criteria andReferenceUpperNotIn(List values) { + addCriterion("reference_upper not in", values, "referenceUpper"); + return (Criteria) this; + } + + public Criteria andReferenceUpperBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("reference_upper between", value1, value2, "referenceUpper"); + return (Criteria) this; + } + + public Criteria andReferenceUpperNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("reference_upper not between", value1, value2, "referenceUpper"); + return (Criteria) this; + } + public Criteria andRelevanceOptionIdIsNull() { addCriterion("relevance_option_id is null"); return (Criteria) this; diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java index 11cb2768..30e49b09 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java @@ -3,6 +3,8 @@ package com.ccsens.tcm.bean.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.math.BigDecimal; import java.util.List; /** @@ -58,6 +60,10 @@ public class QuestionVo { private Byte searchCriteria; @ApiModelProperty("备注") private String remark; + @ApiModelProperty("参考范围 下限") + private BigDecimal referenceLower; + @ApiModelProperty("参考范围 上限") + private BigDecimal referenceUpper; @ApiModelProperty("选项信息") private List optionVos; } @@ -140,6 +146,10 @@ public class QuestionVo { private String units; @ApiModelProperty("类型 1单行文本,2多行文本,3单选,4多选,5下拉菜单,6日期,7图片(文件),8单选+其他，9多选+其他，10下拉+其他，11多选+其他+说明，12单选+关联其他内容 13数字类型") private byte type; + @ApiModelProperty("参考范围 下限") + private BigDecimal referenceLower; + @ApiModelProperty("参考范围 上限") + private BigDecimal referenceUpper; @ApiModelProperty("备注") private String remark; @ApiModelProperty("答题记录id") diff --git a/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java b/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java index 05f073a7..adafb7fe 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java @@ -22,6 +22,7 @@ import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.io.File; +import java.math.BigDecimal; import java.util.*; /** @@ -220,6 +221,19 @@ public class ImportService implements IImportService { question.setUnits(objs.length>5 && StringUtils.isEmpty(objs[5]) ? Constant.STRING_DEFAULT : String.valueOf(objs[5])); question.setSearchCriteria(objs.length>6 && StringUtil.checkNum(String.valueOf(objs[6]), false) ? Byte.parseByte(String.valueOf(objs[6])) : Constant.Question.SEARCH_CRITERIA); question.setRemark(objs.length > 8 && !StringUtils.isEmpty(objs[8]) ? (String) objs[8] : Constant.STRING_DEFAULT); + int referenceIndex = 9; + if (objs.length > referenceIndex && !StringUtils.isEmpty(objs[referenceIndex])) { + String references = (String) objs[referenceIndex]; + String[] split = references.split("--"); + boolean lower = split.length > 0 && StringUtil.isMatch(split[0], StringUtil.NUMBER_DOUBLE) ; + if (lower) { + question.setReferenceLower(new BigDecimal(split[0])); + } + boolean upper = split.length > 1 && StringUtil.isMatch(split[1], StringUtil.NUMBER_DOUBLE); + if (upper) { + question.setReferenceUpper(new BigDecimal(split[1])); + } + } question.setRelevanceOptionId(optionId == null ? 0 : optionId); log.info("导入试题：{}", question); diff --git a/tcm/src/main/resources/application-dev.yml b/tcm/src/main/resources/application-dev.yml index dd22ee3d..83730da5 100644 --- a/tcm/src/main/resources/application-dev.yml +++ b/tcm/src/main/resources/application-dev.yml @@ -10,10 +10,10 @@ spring: rabbitmq: # host: 192.144.182.42 # host: test.tall.wiki - host: 127.0.0.1 - password: guest + host: 192.168.31.13 + password: 111111 port: 5672 - username: guest + username: admin redis: database: 0 host: 127.0.0.1 diff --git a/tcm/src/main/resources/application.yml b/tcm/src/main/resources/application.yml index 33b76558..4ecd13fd 100644 --- a/tcm/src/main/resources/application.yml +++ b/tcm/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: green - include: common, util-green + active: dev + include: common, util-dev diff --git a/tcm/src/main/resources/mapper_dao/QuestionDao.xml b/tcm/src/main/resources/mapper_dao/QuestionDao.xml index bf0d3736..7f2446a3 100644 --- a/tcm/src/main/resources/mapper_dao/QuestionDao.xml +++ b/tcm/src/main/resources/mapper_dao/QuestionDao.xml @@ -19,12 +19,14 @@ replace into t_question (id, question, code, sort, units, type, - relevance_option_id, search_criteria, remark) + relevance_option_id, search_criteria, remark, + reference_lower, reference_upper) values (#{question.id,jdbcType=BIGINT}, #{question.question,jdbcType=VARCHAR}, #{question.code,jdbcType=VARCHAR}, #{question.sort,jdbcType=INTEGER}, #{question.units,jdbcType=VARCHAR}, #{question.type,jdbcType=TINYINT}, - #{question.relevanceOptionId,jdbcType=BIGINT}, #{question.searchCriteria,jdbcType=TINYINT}, #{question.remark,jdbcType=VARCHAR}) + #{question.relevanceOptionId,jdbcType=BIGINT}, #{question.searchCriteria,jdbcType=TINYINT}, + #{question.remark,jdbcType=VARCHAR},#{question.referenceLower,jdbcType=DECIMAL},#{question.referenceUpper,jdbcType=DECIMAL}) @@ -38,6 +40,8 @@ + + @@ -59,6 +63,8 @@ q.relevance_option_id as qrelevance_option_id, q.search_criteria as qsearch_criteria, q.remark as qremark, + q.reference_lower as referenceLower, + q.reference_upper as referenceUpper, o.id as oid, o.question_id as oquestion_id, o.sort as osort, @@ -105,6 +111,8 @@ + + @@ -133,6 +141,8 @@ q.sort as qsort, q.units as qunits, q.type as qtype, + q.reference_lower as referenceLower, + q.reference_upper as referenceUpper, q.remark as qremark, o.id as oid, o.sort as osort, diff --git a/tcm/src/main/resources/mapper_raw/QuestionMapper.xml b/tcm/src/main/resources/mapper_raw/QuestionMapper.xml index 04e2e9c7..516816c4 100644 --- a/tcm/src/main/resources/mapper_raw/QuestionMapper.xml +++ b/tcm/src/main/resources/mapper_raw/QuestionMapper.xml @@ -8,6 +8,8 @@ + + @@ -75,8 +77,8 @@ - id, question, code, sort, units, type, relevance_option_id, search_criteria, remark, - operator, created_at, updated_at, rec_status + id, question, code, sort, units, type, reference_lower, reference_upper, relevance_option_id, + search_criteria, remark, operator, created_at, updated_at, rec_status