diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/request/MeasuringUsageQuery.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/request/MeasuringUsageQuery.java index 79b1dd1f..9814c272 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/request/MeasuringUsageQuery.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/request/MeasuringUsageQuery.java @@ -33,5 +33,10 @@ public class MeasuringUsageQuery { */ @Schema(description = "类别名称") private String typeName; + /** + * 设备编码 + */ + @Schema(description = "设备编码") + private String equiCode; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/IMeasuringUsageServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/IMeasuringUsageServiceImpl.java index 8ffb236b..76477700 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/IMeasuringUsageServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/IMeasuringUsageServiceImpl.java @@ -75,6 +75,9 @@ public class IMeasuringUsageServiceImpl implements IMeasuringUsageService { if (StringUtil.isNotEmpty(measuringUsageQuery.getTypeName())) { requestBody.put("typeName", measuringUsageQuery.getTypeName()); } + if (StringUtil.isNotEmpty(measuringUsageQuery.getEquiCode())) { + requestBody.put("equiCode", measuringUsageQuery.getEquiCode()); + } } log.debug("请求参数: {}", requestBody.toJSONString()); diff --git a/doc/sql/mes/insert-260106.sql b/doc/sql/mes/insert-260106.sql index 63ad7df9..8ea225ae 100644 --- a/doc/sql/mes/insert-260106.sql +++ b/doc/sql/mes/insert-260106.sql @@ -16,3 +16,49 @@ Insert into BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, values (2008365020491440129, 2008364878937874434, 'equipment_used', '2', '服役中', 1, '服役中', 0, 1, 0); Insert into BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) values (2008365080713256962, 2008364878937874434, 'equipment_used', '3', '暂停服役', 2, '暂停服役', 0, 1, 0); + + + +CREATE TABLE MES_RECORDER +( + ID NUMBER(20,0) NOT NULL ENABLE, + TENANT_ID NVARCHAR2(12), + CREATE_USER NUMBER(20,0), + CREATE_TIME DATE, + CREATE_DEPT NUMBER(20,0), + UPDATE_USER NUMBER(20,0), + UPDATE_TIME DATE, + STATUS NUMBER(11,0), + IS_DELETED NUMBER(11,0) DEFAULT 0, + RECORDER NUMBER(20,0), + RECORD_DATE DATE, + MEMO NVARCHAR2(255), + PRIMARY KEY (ID) +) TABLESPACE JONHON_MES_DATA; + +COMMENT +ON COLUMN MES_RECORDER.ID IS '主键'; +COMMENT +ON COLUMN MES_RECORDER.CREATE_USER IS '创建人'; +COMMENT +ON COLUMN MES_RECORDER.CREATE_TIME IS '创建时间'; +COMMENT +ON COLUMN MES_RECORDER.CREATE_DEPT IS '创建部门'; +COMMENT +ON COLUMN MES_RECORDER.UPDATE_USER IS '更新人'; +COMMENT +ON COLUMN MES_RECORDER.UPDATE_TIME IS '更新时间'; +COMMENT +ON COLUMN MES_RECORDER.STATUS IS '状态'; +COMMENT +ON COLUMN MES_RECORDER.IS_DELETED IS '是否已删除'; +COMMENT +ON COLUMN MES_RECORDER.RECORDER IS '记录仪'; +COMMENT +ON COLUMN MES_RECORDER.RECORD_DATE IS '记录时间'; +COMMENT +ON COLUMN MES_RECORDER.MEMO IS '数据信息'; +COMMENT +ON TABLE MES_RECORDER IS '记录仪记录'; + +