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 657c01c..4dac3e4 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
@@ -34,7 +34,7 @@ public class OrgEquipmentExecutor implements OrgEquipmentApi {
OrgEquipmentEntity entity = new OrgEquipmentEntity();
entity.setDeviceName(cmd.getDeviceName());
entity.setDeviceModel(cmd.getDeviceModel());
- entity.setInstrumentTypeCode(cmd.getInstrumentTypeCode());
+ entity.setIndustryCode(cmd.getIndustryCode());
entity.setInstrumentTypeName(cmd.getInstrumentTypeName());
entity.setDeviceTypeCode(cmd.getDeviceTypeCode());
entity.setDeviceTypeName(cmd.getDeviceTypeName());
@@ -65,7 +65,7 @@ public class OrgEquipmentExecutor implements OrgEquipmentApi {
entity.setId(cmd.getId());
entity.setDeviceName(cmd.getDeviceName());
entity.setDeviceModel(cmd.getDeviceModel());
- entity.setInstrumentTypeCode(cmd.getInstrumentTypeCode());
+ entity.setIndustryCode(cmd.getIndustryCode());
entity.setInstrumentTypeName(cmd.getInstrumentTypeName());
entity.setDeviceTypeCode(cmd.getDeviceTypeCode());
entity.setDeviceTypeName(cmd.getDeviceTypeName());
@@ -119,7 +119,7 @@ public class OrgEquipmentExecutor implements OrgEquipmentApi {
co.setId(entity.getId());
co.setDeviceName(entity.getDeviceName());
co.setDeviceModel(entity.getDeviceModel());
- co.setInstrumentTypeCode(entity.getInstrumentTypeCode());
+ co.setIndustryCode(entity.getIndustryCode());
co.setInstrumentTypeName(entity.getInstrumentTypeName());
co.setDeviceTypeCode(entity.getDeviceTypeCode());
co.setDeviceTypeName(entity.getDeviceTypeName());
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 dce3876..e9bb384 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
@@ -22,8 +22,8 @@ public class OrgEquipmentCO {
@ApiModelProperty(value = "设备型号")
private String deviceModel;
- @ApiModelProperty(value = "仪器类型编码")
- private String instrumentTypeCode;
+ @ApiModelProperty(value = "行业code")
+ private String industryCode;
@ApiModelProperty(value = "仪器类型名称")
private String instrumentTypeName;
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 e1f1fa5..42570f8 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
@@ -18,8 +18,8 @@ public class OrgEquipmentAddCmd {
@ApiModelProperty(value = "设备型号")
private String deviceModel;
- @ApiModelProperty(value = "仪器类型编码")
- private String instrumentTypeCode;
+ @ApiModelProperty(value = "行业code")
+ private String industryCode;
@ApiModelProperty(value = "仪器类型名称")
private String instrumentTypeName;
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 a07d12e..f6b98a6 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
@@ -21,8 +21,8 @@ public class OrgEquipmentModifyCmd {
@ApiModelProperty(value = "设备型号")
private String deviceModel;
- @ApiModelProperty(value = "仪器类型编码")
- private String instrumentTypeCode;
+ @ApiModelProperty(value = "行业code")
+ private String industryCode;
@ApiModelProperty(value = "仪器类型名称")
private String instrumentTypeName;
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/request/OrgBusinessScopeDeviceRefAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/request/OrgBusinessScopeDeviceRefAddCmd.java
index 4a98ed6..cf9b997 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/request/OrgBusinessScopeDeviceRefAddCmd.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/request/OrgBusinessScopeDeviceRefAddCmd.java
@@ -20,16 +20,16 @@ public class OrgBusinessScopeDeviceRefAddCmd implements Serializable {
@ApiModelProperty(value = "看 IndustryEnum")
private String industryCode;
/**
- * 设备code
+ * 设备类型code
*/
- @ApiModelProperty(value = "设备code")
- private String deviceCode;
+ @ApiModelProperty(value = "设备类型code")
+ private String deviceTypeCode;
/**
- * 设备名称
+ * 设备类型名称
*/
- @ApiModelProperty(value = "设备名称", required = true)
- @NotBlank(message = "设备名称不能为空")
- private String deviceName;
+ @ApiModelProperty(value = "设备类型名称", required = true)
+ @NotBlank(message = "设备类型名称不能为空")
+ private String deviceTypeName;
/**
* 环境
*/
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/request/OrgBusinessScopeDeviceRefPageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/request/OrgBusinessScopeDeviceRefPageQry.java
index 3d8d1ad..e4780cf 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/request/OrgBusinessScopeDeviceRefPageQry.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/request/OrgBusinessScopeDeviceRefPageQry.java
@@ -18,15 +18,15 @@ public class OrgBusinessScopeDeviceRefPageQry extends PageQuery {
@ApiModelProperty(value = "行业code 看 IndustryEnum")
private String industryCode;
/**
- * 设备code
+ * 设备类型code
*/
- @ApiModelProperty(value = "设备code")
- private String deviceCode;
+ @ApiModelProperty(value = "设备类型code")
+ private String deviceTypeCode;
/**
- * 设备名称
+ * 设备类型名称
*/
- @ApiModelProperty(value = "设备名称")
- private String deviceName;
+ @ApiModelProperty(value = "设备类型名称")
+ private String deviceTypeName;
/**
* 环境
*/
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/request/OrgBusinessScopeDeviceRefUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/request/OrgBusinessScopeDeviceRefUpdateCmd.java
index 37428c6..daf905a 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/request/OrgBusinessScopeDeviceRefUpdateCmd.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/request/OrgBusinessScopeDeviceRefUpdateCmd.java
@@ -23,16 +23,16 @@ public class OrgBusinessScopeDeviceRefUpdateCmd implements Serializable {
@ApiModelProperty(value = "看 IndustryEnum")
private String industryCode;
/**
- * 设备code
+ * 设备类型code
*/
- @ApiModelProperty(value = "设备code")
- private String deviceCode;
+ @ApiModelProperty(value = "设备类型code")
+ private String deviceTypeCode;
/**
- * 设备名称
+ * 设备类型名称
*/
- @ApiModelProperty(value = "设备名称", required = true)
- @NotBlank(message = "设备名称不能为空")
- private String deviceName;
+ @ApiModelProperty(value = "设备类型名称", required = true)
+ @NotBlank(message = "设备类型名称不能为空")
+ private String deviceTypeName;
/**
* 环境
*/
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/response/OrgBusinessScopeDeviceRefCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/response/OrgBusinessScopeDeviceRefCo.java
index 0ef78f2..f4fa1bd 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/response/OrgBusinessScopeDeviceRefCo.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/response/OrgBusinessScopeDeviceRefCo.java
@@ -20,15 +20,15 @@ public class OrgBusinessScopeDeviceRefCo extends ClientObject {
@ApiModelProperty(value = "行业code 看 IndustryEnum")
private String industryCode;
/**
- * 设备code
+ * 设备类型code
*/
- @ApiModelProperty(value = "设备code")
- private String deviceCode;
+ @ApiModelProperty(value = "设备类型code")
+ private String deviceTypeCode;
/**
- * 设备名称
+ * 设备类型名称
*/
- @ApiModelProperty(value = "设备名称")
- private String deviceName;
+ @ApiModelProperty(value = "设备类型名称")
+ private String deviceTypeName;
/**
* 环境
*/
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 1d8f2a7..bd9d661 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
@@ -24,8 +24,8 @@ public class OrgEquipmentEntity {
/** 设备型号 */
private String deviceModel;
- /** 仪器类型编码 */
- private String instrumentTypeCode;
+ /** 行业code */
+ private String industryCode;
/** 仪器类型名称 */
private String instrumentTypeName;
diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/ref/model/OrgBusinessScopeDeviceRefE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/ref/model/OrgBusinessScopeDeviceRefE.java
index bf5999f..e20f6bd 100644
--- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/ref/model/OrgBusinessScopeDeviceRefE.java
+++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/ref/model/OrgBusinessScopeDeviceRefE.java
@@ -25,13 +25,13 @@ public class OrgBusinessScopeDeviceRefE extends BaseE {
*/
private String industryCode;
/**
- * 设备code
+ * 设备类型code
*/
- private String deviceCode;
+ private String deviceTypeCode;
/**
- * 设备名称
+ * 设备类型名称
*/
- private String deviceName;
+ private String deviceTypeName;
/**
* 环境
*/
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 6276aba..134bda7 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
@@ -19,7 +19,7 @@ public class OrgEquipmentDO {
private Long orgId;
private String deviceName;
private String deviceModel;
- private String instrumentTypeCode;
+ private String industryCode;
private String instrumentTypeName;
private String deviceTypeCode;
private String deviceTypeName;
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 bbdbad5..de58f72 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
@@ -73,7 +73,7 @@ public class OrgEquipmentGatewayImpl implements OrgEquipmentGateway {
}
if (StringUtils.hasText(query.getInstrumentType())) {
wrapper.and(w -> w.like(OrgEquipmentDO::getInstrumentTypeName, query.getInstrumentType())
- .or().like(OrgEquipmentDO::getInstrumentTypeCode, query.getInstrumentType()));
+ .or().like(OrgEquipmentDO::getIndustryCode, query.getInstrumentType()));
}
if (StringUtils.hasText(query.getDeviceType())) {
wrapper.and(w -> w.like(OrgEquipmentDO::getDeviceTypeName, query.getDeviceType())
@@ -98,7 +98,7 @@ public class OrgEquipmentGatewayImpl implements OrgEquipmentGateway {
dataObject.setOrgId(orgContextResolver.resolveOrgId(entity.getOrgId()));
dataObject.setDeviceName(entity.getDeviceName());
dataObject.setDeviceModel(entity.getDeviceModel());
- dataObject.setInstrumentTypeCode(entity.getInstrumentTypeCode());
+ dataObject.setIndustryCode(entity.getIndustryCode());
dataObject.setInstrumentTypeName(entity.getInstrumentTypeName());
dataObject.setDeviceTypeCode(entity.getDeviceTypeCode());
dataObject.setDeviceTypeName(entity.getDeviceTypeName());
@@ -124,7 +124,7 @@ public class OrgEquipmentGatewayImpl implements OrgEquipmentGateway {
entity.setId(dataObject.getId());
entity.setDeviceName(dataObject.getDeviceName());
entity.setDeviceModel(dataObject.getDeviceModel());
- entity.setInstrumentTypeCode(dataObject.getInstrumentTypeCode());
+ entity.setIndustryCode(dataObject.getIndustryCode());
entity.setInstrumentTypeName(dataObject.getInstrumentTypeName());
entity.setDeviceTypeCode(dataObject.getDeviceTypeCode());
entity.setDeviceTypeName(dataObject.getDeviceTypeName());
diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/OrgBusinessScopeDeviceRefDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/OrgBusinessScopeDeviceRefDO.java
index 4f0ac69..a6b20b7 100644
--- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/OrgBusinessScopeDeviceRefDO.java
+++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/OrgBusinessScopeDeviceRefDO.java
@@ -22,13 +22,13 @@ public class OrgBusinessScopeDeviceRefDO extends BaseDO {
*/
private String industryCode;
/**
- * 设备code
+ * 设备类型code
*/
- private String deviceCode;
+ private String deviceTypeCode;
/**
- * 设备名称
+ * 设备类型名称
*/
- private String deviceName;
+ private String deviceTypeName;
/**
* 环境
*/
diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/OrgBusinessScopeDeviceRefRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/OrgBusinessScopeDeviceRefRepositoryImpl.java
index 781859b..1e6a2af 100644
--- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/OrgBusinessScopeDeviceRefRepositoryImpl.java
+++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/OrgBusinessScopeDeviceRefRepositoryImpl.java
@@ -37,11 +37,11 @@ public class OrgBusinessScopeDeviceRefRepositoryImpl extends BaseRepositoryImpl<
if (ObjectUtil.isNotEmpty(orgBusinessScopeDeviceRefPageQry.getIndustryCode())) {
orgBusinessScopeDeviceRefDoQueryWrapper.eq("industry_code", orgBusinessScopeDeviceRefPageQry.getIndustryCode());
}
- if (ObjectUtil.isNotEmpty(orgBusinessScopeDeviceRefPageQry.getDeviceCode())) {
- orgBusinessScopeDeviceRefDoQueryWrapper.eq("device_code", orgBusinessScopeDeviceRefPageQry.getDeviceCode());
+ if (ObjectUtil.isNotEmpty(orgBusinessScopeDeviceRefPageQry.getDeviceTypeCode())) {
+ orgBusinessScopeDeviceRefDoQueryWrapper.eq("device_type_code", orgBusinessScopeDeviceRefPageQry.getDeviceTypeCode());
}
- if (ObjectUtil.isNotEmpty(orgBusinessScopeDeviceRefPageQry.getDeviceName())) {
- orgBusinessScopeDeviceRefDoQueryWrapper.like("device_name", orgBusinessScopeDeviceRefPageQry.getDeviceName());
+ if (ObjectUtil.isNotEmpty(orgBusinessScopeDeviceRefPageQry.getDeviceTypeName())) {
+ orgBusinessScopeDeviceRefDoQueryWrapper.like("device_type_name", orgBusinessScopeDeviceRefPageQry.getDeviceTypeName());
}
if (ObjectUtil.isNotEmpty(orgBusinessScopeDeviceRefPageQry.getEnv())) {
orgBusinessScopeDeviceRefDoQueryWrapper.eq("env", orgBusinessScopeDeviceRefPageQry.getEnv());
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/OrgBusinessScopeDeviceRefMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/OrgBusinessScopeDeviceRefMapper.xml
index 0708962..fd9b98e 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/OrgBusinessScopeDeviceRefMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/OrgBusinessScopeDeviceRefMapper.xml
@@ -7,8 +7,8 @@
id="OrgBusinessScopeDeviceRefResult">
-
-
+
+
@@ -25,8 +25,8 @@
select id,
industry_code,
- device_code,
- device_name,
+ device_type_code,
+ device_type_name,
delete_enum,
remarks,
create_name,
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/OrgEquipmentMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/OrgEquipmentMapper.xml
index fcdbb3d..48059b7 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/OrgEquipmentMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/OrgEquipmentMapper.xml
@@ -8,7 +8,7 @@
-
+
@@ -37,7 +37,7 @@
- `id`, `org_id`, `device_name`, `device_model`, `instrument_type_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`, `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`