diff --git a/src/main/java/com/glxp/api/dao/system/SysTableHeadMapper.java b/src/main/java/com/glxp/api/dao/system/SysTableHeadMapper.java new file mode 100644 index 00000000..c1209ab3 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/system/SysTableHeadMapper.java @@ -0,0 +1,10 @@ +package com.glxp.api.dao.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.system.SysTableHeadEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SysTableHeadMapper extends BaseMapperPlus { +} diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanEntity.java index 93fd2d4c..8301f9de 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanEntity.java @@ -131,4 +131,9 @@ public class DeviceInspectPlanEntity { */ private Integer useFrequency; + /** + * 已执行次数 + */ + private Integer executeCount; + } diff --git a/src/main/java/com/glxp/api/entity/system/SysTableHeadEntity.java b/src/main/java/com/glxp/api/entity/system/SysTableHeadEntity.java new file mode 100644 index 00000000..c9932366 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/system/SysTableHeadEntity.java @@ -0,0 +1,90 @@ +package com.glxp.api.entity.system; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +@Data +@TableName(value = "sys_table_head") +public class SysTableHeadEntity implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 前端页面 + */ + @TableField(value = "page") + private String page; + + /** + * 所属后端返回类 + */ + @TableField(value = "response") + private String response; + + /** + * 显示的标题 + */ + @TableField(value = "`label`") + private String label; + + /** + * 字段名 + */ + @TableField(value = "prop") + private String prop; + + /** + * 对应列的宽度 + */ + @TableField(value = "width") + private Double width; + + /** + * 是否显示 + */ + @TableField(value = "isShow") + private String isShow; + + /** + * 自适应宽度 + */ + @TableField(value = "isAuto") + private String isAuto; + + /** + * 当内容过长被隐藏时显示 tooltip + */ + @TableField(value = "overflow") + private Byte overflow; + + /** + * 排序顺序 + */ + @TableField(value = "sort") + private Integer sort; + + /** + * 是否启用自定义排序 + */ + @TableField(value = "customSort") + private Byte customSort; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/service/system/SysTableHeadService.java b/src/main/java/com/glxp/api/service/system/SysTableHeadService.java new file mode 100644 index 00000000..4ed95258 --- /dev/null +++ b/src/main/java/com/glxp/api/service/system/SysTableHeadService.java @@ -0,0 +1,13 @@ +package com.glxp.api.service.system; + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.entity.system.SysTableHeadEntity; +import com.glxp.api.dao.system.SysTableHeadMapper; + +@Service +public class SysTableHeadService extends ServiceImpl { + +} + + diff --git a/src/main/resources/mybatis/mapper/system/SysTableHeadMapper.xml b/src/main/resources/mybatis/mapper/system/SysTableHeadMapper.xml new file mode 100644 index 00000000..c0b4b814 --- /dev/null +++ b/src/main/resources/mybatis/mapper/system/SysTableHeadMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + id, page, response, `label`, prop, width, isShow, isAuto, overflow, sort, customSort, + remark, updateTime + + diff --git a/src/main/resources/schemas/schema_v2.2.sql b/src/main/resources/schemas/schema_v2.2.sql index fd6742c0..fb8434d3 100644 --- a/src/main/resources/schemas/schema_v2.2.sql +++ b/src/main/resources/schemas/schema_v2.2.sql @@ -180,28 +180,37 @@ CALL Pro_Temp_ColumnWork('sync_data_set', 'deviceTask', 'tinyint', 1); # INSERT ignore INTO `udi_wms_wmd`.`auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2001, '我的领用单', 1685, 1, 'inout/receive/receiveMySearch', 'inout/receive/receiveMySearch', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-08-14 10:35:30', NULL, NULL, NULL); # -INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (20068, 0, '设备领用是否选取耗材字段', 'device_product', '0', 1, 0, '0：否；1：是', NULL); -INSERT ignore INTO `sys_pdf_template_relevance_label` (`id`, `templateId`, `customerId`, `adminId`, `moduleId`, `localAction`, `remark1`, `remark2`, `remark3`, `printType`, `modelKey`, `updateTime`) VALUES (5, 3, 110, 0, 9, '设备打印', NULL, NULL, NULL, NULL, 'lable', '2023-06-25 15:18:37'); - - - -CREATE TABLE IF NOT EXISTS `device_asset_cert` ( - `id` bigint NOT NULL, - `devCodeFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备资产编码外键', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '证书名称', - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '证书编码', - `filePath` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '文件路径', - `vailDate` datetime(0) NULL DEFAULT NULL COMMENT '生效期', - `expireDate` datetime(0) NULL DEFAULT NULL COMMENT '失效期', - `status` tinyint NULL DEFAULT NULL COMMENT '证书状态', - `type` tinyint NULL DEFAULT NULL COMMENT '证书类型（1：资质证书；2：技术材料）', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注说明', - `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', - `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `updateUser` datetime(0) NULL DEFAULT NULL COMMENT '更新人', - `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; +INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, + `paramType`, `paramExplain`, `updateTime`) +VALUES (20068, 0, '设备领用是否选取耗材字段', 'device_product', '0', 1, 0, '0：否；1：是', NULL); +INSERT ignore INTO `sys_pdf_template_relevance_label` (`id`, `templateId`, `customerId`, `adminId`, `moduleId`, + `localAction`, `remark1`, `remark2`, `remark3`, `printType`, + `modelKey`, `updateTime`) +VALUES (5, 3, 110, 0, 9, '设备打印', NULL, NULL, NULL, NULL, 'lable', '2023-06-25 15:18:37'); + + + +CREATE TABLE IF NOT EXISTS `device_asset_cert` +( + `id` bigint NOT NULL, + `devCodeFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备资产编码外键', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '证书名称', + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '证书编码', + `filePath` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '文件路径', + `vailDate` datetime(0) NULL DEFAULT NULL COMMENT '生效期', + `expireDate` datetime(0) NULL DEFAULT NULL COMMENT '失效期', + `status` tinyint NULL DEFAULT NULL COMMENT '证书状态', + `type` tinyint NULL DEFAULT NULL COMMENT '证书类型（1：资质证书；2：技术材料）', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注说明', + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `updateUser` datetime(0) NULL DEFAULT NULL COMMENT '更新人', + `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci + ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of device_asset_cert @@ -210,36 +219,48 @@ CREATE TABLE IF NOT EXISTS `device_asset_cert` ( SET FOREIGN_KEY_CHECKS = 1; -CREATE TABLE IF NOT EXISTS `device_asset_user` ( - `id` bigint NOT NULL COMMENT '雪花ID', - `devCodeFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备资产编码', - `userName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '相关人员名称', - `contact1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '联系方式1', - `contact2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '联系方式2', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注说明', - `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', - `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `updateUser` varchar(0) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', - `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; - - -CREATE TABLE IF NOT EXISTS `device_asset_usage` ( - `id` bigint NOT NULL COMMENT '雪花ID', - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '使用记录号', - `user` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '使用人', - `startTime` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', - `endTime` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注', - `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', - `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', - `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; +CREATE TABLE IF NOT EXISTS `device_asset_user` +( + `id` bigint NOT NULL COMMENT '雪花ID', + `devCodeFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备资产编码', + `userName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '相关人员名称', + `contact1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '联系方式1', + `contact2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '联系方式2', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注说明', + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `updateUser` varchar(0) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci + ROW_FORMAT = Dynamic; + + +CREATE TABLE IF NOT EXISTS `device_asset_usage` +( + `id` bigint NOT NULL COMMENT '雪花ID', + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '使用记录号', + `user` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '使用人', + `startTime` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', + `endTime` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注', + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci + ROW_FORMAT = Dynamic; CALL Pro_Temp_ColumnWork('dept_device_detail', 'curUser', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('dept_device_detail', 'location', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('dept_device_detail', 'detailLocation', 'varchar(255)', 1); + +CALL Pro_Temp_ColumnWork('device_inspect_plan', 'executeCount', 'int', 1); +CALL Pro_Temp_ColumnWork('device_inspect_plan', 'useFrequency', 'int', 1); +