cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

basic

dev_1.0.1
luotaiqian 2026-07-15 14:37:16 +08:00
parent 612882849a
commit 095950c5be
16 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java
View File

@ -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());

4
safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgEquipmentCO.java
View File

@ -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;

4
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentAddCmd.java
View File

@ -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;

4
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentModifyCmd.java
View File

@ -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;

14
safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/request/OrgBusinessScopeDeviceRefAddCmd.java
View File

@ -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;
/**
* 环境
*/

12
safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/request/OrgBusinessScopeDeviceRefPageQry.java
View File

@ -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;
/**
* 环境
*/

14
safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/request/OrgBusinessScopeDeviceRefUpdateCmd.java
View File

@ -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;
/**
* 环境
*/

12
safety-eval-client/src/main/java/org/qinan/safetyeval/client/ref/response/OrgBusinessScopeDeviceRefCo.java
View File

@ -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;
/**
* 环境
*/

4
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgEquipmentEntity.java
View File

@ -24,8 +24,8 @@ public class OrgEquipmentEntity {
/** 设备型号 */
private String deviceModel;
/** 仪器类型编码 */
private String instrumentTypeCode;
/** 行业code */
private String industryCode;
/** 仪器类型名称 */
private String instrumentTypeName;

8
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/ref/model/OrgBusinessScopeDeviceRefE.java
View File

@ -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;
/**
* 环境
*/

2
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgEquipmentDO.java
View File

@ -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;

6
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java
View File

@ -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());

8
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/OrgBusinessScopeDeviceRefDO.java
View File

@ -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;
/**
* 环境
*/

8
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/OrgBusinessScopeDeviceRefRepositoryImpl.java
View File

@ -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());

8
safety-eval-infrastructure/src/main/resources/mapper/OrgBusinessScopeDeviceRefMapper.xml
View File

@ -7,8 +7,8 @@
id="OrgBusinessScopeDeviceRefResult">
<id property="id" column="id"/>
<result property="industryCode" column="industry_code"/>
<result property="deviceCode" column="device_code"/>
<result property="deviceName" column="device_name"/>
<result property="deviceTypeCode" column="device_type_code"/>
<result property="deviceTypeName" column="device_type_name"/>
<result property="deleteEnum" column="delete_enum"/>
<result property="remarks" column="remarks"/>
<result property="createName" column="create_name"/>
@ -25,8 +25,8 @@
<sql id="selectOrgBusinessScopeDeviceRef">
select id,
industry_code,
device_code,
device_name,
device_type_code,
device_type_name,
delete_enum,
remarks,
create_name,

4
safety-eval-infrastructure/src/main/resources/mapper/OrgEquipmentMapper.xml
View File

@ -8,7 +8,7 @@
<result column="org_id" property="orgId"/>
<result column="device_name" property="deviceName"/>
<result column="device_model" property="deviceModel"/>
<result column="instrument_type_code" property="instrumentTypeCode"/>
<result column="industry_code" property="industryCode"/>
<result column="instrument_type_name" property="instrumentTypeName"/>
<result column="device_type_code" property="deviceTypeCode"/>
<result column="device_type_name" property="deviceTypeName"/>
@ -37,7 +37,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
`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`
</sql>
</mapper>