diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index 25c6383..a75e41c 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -110,13 +110,15 @@ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效,,多机环境在SpringSessionConfig类中配置) 单位:秒 session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒 no-login-urls: /user/login,/kaptcha,/config/baseConfig - file: dir: D:\cz\203\file getui: app-id: RoW3b4QCWH9EnYYiyaUJz5 #计量appid app-key: fRjRIdibj47mBZV2Ru5Uf7 #app key master-secret: yH3Otq5z5t6ZgNvENle0Z7 + eqpt: + electric-signal: 3 #0.02活塞压力-核查数据模板,列数3,这里以核查点为主 + multi-calibration: 6 #多功能校准源核查数据模版,核查数据模板为6 #代码生成器配置 code: generate: diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index 25c6383..a75e41c 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -110,13 +110,15 @@ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效,,多机环境在SpringSessionConfig类中配置) 单位:秒 session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒 no-login-urls: /user/login,/kaptcha,/config/baseConfig - file: dir: D:\cz\203\file getui: app-id: RoW3b4QCWH9EnYYiyaUJz5 #计量appid app-key: fRjRIdibj47mBZV2Ru5Uf7 #app key master-secret: yH3Otq5z5t6ZgNvENle0Z7 + eqpt: + electric-signal: 3 #0.02活塞压力-核查数据模板,列数3,这里以核查点为主 + multi-calibration: 6 #多功能校准源核查数据模版,核查数据模板为6 #代码生成器配置 code: generate: diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index 8750f87..b34fbd4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -264,6 +264,11 @@ @TableField(exist = false) private String dataNo; + @ApiModelProperty(value = "结果(合格、不合格)(前端必传,打印需要)", dataType = "String") + @TableField(exist = false) + private String outcome; + + @ApiModelProperty(value = "出厂编号(前端必传,打印需要)", dataType = "String") @TableField(exist = false) private String manufactureNo; diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index 25c6383..a75e41c 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -110,13 +110,15 @@ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效,,多机环境在SpringSessionConfig类中配置) 单位:秒 session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒 no-login-urls: /user/login,/kaptcha,/config/baseConfig - file: dir: D:\cz\203\file getui: app-id: RoW3b4QCWH9EnYYiyaUJz5 #计量appid app-key: fRjRIdibj47mBZV2Ru5Uf7 #app key master-secret: yH3Otq5z5t6ZgNvENle0Z7 + eqpt: + electric-signal: 3 #0.02活塞压力-核查数据模板,列数3,这里以核查点为主 + multi-calibration: 6 #多功能校准源核查数据模版,核查数据模板为6 #代码生成器配置 code: generate: diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index 8750f87..b34fbd4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -264,6 +264,11 @@ @TableField(exist = false) private String dataNo; + @ApiModelProperty(value = "结果(合格、不合格)(前端必传,打印需要)", dataType = "String") + @TableField(exist = false) + private String outcome; + + @ApiModelProperty(value = "出厂编号(前端必传,打印需要)", dataType = "String") @TableField(exist = false) private String manufactureNo; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java index e014064..6742cbc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java @@ -2,7 +2,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.stream.CollectorUtil; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; @@ -24,7 +23,6 @@ import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.SnowflakeUtil; import com.casic.missiles.utils.SpringContextUtil; -import io.swagger.annotations.ApiModelProperty; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils;