diff --git a/docs/sql/20260804_org_equipment_add_equipment_value.sql b/docs/sql/20260804_org_equipment_add_equipment_value.sql new file mode 100644 index 0000000..f70b176 --- /dev/null +++ b/docs/sql/20260804_org_equipment_add_equipment_value.sql @@ -0,0 +1,3 @@ +-- org_equipment 表新增 设备价值 字段 +ALTER TABLE `org_equipment` + ADD COLUMN `equipment_value` decimal(14, 2) NULL COMMENT '设备价值' AFTER `manufacturer`; diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java index d5925ab..a25ae99 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java @@ -45,6 +45,7 @@ public class OrgEquipmentExecutor implements OrgEquipmentApi { entity.setDeviceTypeCode(cmd.getDeviceTypeCode()); entity.setDeviceTypeName(cmd.getDeviceTypeName()); entity.setManufacturer(cmd.getManufacturer()); + entity.setEquipmentValue(cmd.getEquipmentValue()); entity.setFlowDesc(cmd.getFlowDesc()); entity.setMinFlow(cmd.getMinFlow()); entity.setMaxFlow(cmd.getMaxFlow()); @@ -137,6 +138,7 @@ public class OrgEquipmentExecutor implements OrgEquipmentApi { co.setDeviceTypeCode(entity.getDeviceTypeCode()); co.setDeviceTypeName(entity.getDeviceTypeName()); co.setManufacturer(entity.getManufacturer()); + co.setEquipmentValue(entity.getEquipmentValue()); co.setFlowDesc(entity.getFlowDesc()); co.setMinFlow(entity.getMinFlow()); co.setMaxFlow(entity.getMaxFlow()); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgEquipmentCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgEquipmentCO.java index e9bb384..f27460e 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgEquipmentCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgEquipmentCO.java @@ -37,6 +37,9 @@ public class OrgEquipmentCO { @ApiModelProperty(value = "生产厂家") private String manufacturer; + @ApiModelProperty(value = "设备价值") + private BigDecimal equipmentValue; + @ApiModelProperty(value = "流量描述") private String flowDesc; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentAddCmd.java index 42570f8..b931407 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentAddCmd.java @@ -33,6 +33,9 @@ public class OrgEquipmentAddCmd { @ApiModelProperty(value = "厂家") private String manufacturer; + @ApiModelProperty(value = "设备价值") + private BigDecimal equipmentValue; + @ApiModelProperty(value = "设备流量说明") private String flowDesc; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentModifyCmd.java index f6b98a6..74ea39e 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentModifyCmd.java @@ -36,6 +36,9 @@ public class OrgEquipmentModifyCmd { @ApiModelProperty(value = "厂家") private String manufacturer; + @ApiModelProperty(value = "设备价值") + private BigDecimal equipmentValue; + @ApiModelProperty(value = "设备流量说明") private String flowDesc; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgEquipmentEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgEquipmentEntity.java index bd9d661..bda97c6 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgEquipmentEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgEquipmentEntity.java @@ -39,6 +39,9 @@ public class OrgEquipmentEntity { /** 厂家 */ private String manufacturer; + /** 设备价值 */ + private BigDecimal equipmentValue; + /** 设备流量说明 */ private String flowDesc; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgEquipmentDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgEquipmentDO.java index 134bda7..0d7b254 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgEquipmentDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgEquipmentDO.java @@ -24,6 +24,7 @@ public class OrgEquipmentDO { private String deviceTypeCode; private String deviceTypeName; private String manufacturer; + private BigDecimal equipmentValue; private String flowDesc; private BigDecimal minFlow; private BigDecimal maxFlow; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java index de58f72..bb83f9c 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java @@ -129,6 +129,7 @@ public class OrgEquipmentGatewayImpl implements OrgEquipmentGateway { entity.setDeviceTypeCode(dataObject.getDeviceTypeCode()); entity.setDeviceTypeName(dataObject.getDeviceTypeName()); entity.setManufacturer(dataObject.getManufacturer()); + entity.setEquipmentValue(dataObject.getEquipmentValue()); entity.setFlowDesc(dataObject.getFlowDesc()); entity.setMinFlow(dataObject.getMinFlow()); entity.setMaxFlow(dataObject.getMaxFlow()); diff --git a/safety-eval-infrastructure/src/main/resources/mapper/OrgEquipmentMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/OrgEquipmentMapper.xml index 48059b7..9c52317 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/OrgEquipmentMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/OrgEquipmentMapper.xml @@ -37,7 +37,7 @@ - `id`, `org_id`, `device_name`, `device_model`, `industry_code`, `instrument_type_name`, `device_type_code`, `device_type_name`, `manufacturer`, `flow_desc`, `min_flow`, `max_flow`, `calibration_unit`, `calibration_init_value`, `field_calibration_type_code`, `field_calibration_type_name`, `dual_channel_flag`, `enable_flag`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env` + `id`, `org_id`, `device_name`, `device_model`, `industry_code`, `instrument_type_name`, `device_type_code`, `device_type_name`, `manufacturer`, `equipment_value`, `flow_desc`, `min_flow`, `max_flow`, `calibration_unit`, `calibration_init_value`, `field_calibration_type_code`, `field_calibration_type_name`, `dual_channel_flag`, `enable_flag`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`