From ca48f8c87bb927c7be7f02b7eaaf71996e759bff Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 10 四月 2025 14:54:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/mesRedisChange.sql | 63 +++++++++++++++++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/ConstSysConfig.java | 96 ++++++++++++++++++++++++++++++++
2 files changed, 159 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/ConstSysConfig.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/ConstSysConfig.java
new file mode 100644
index 0000000..12733a2
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/ConstSysConfig.java
@@ -0,0 +1,96 @@
+package com.mes.common.config;
+
+
+/**
+ * @Author : zt
+ * @Date: 2025/4/08 10:33
+ * @Description:
+ */
+public class ConstSysConfig {
+
+
+ // 閽㈠寲鐐夋暟闃堝��
+ public static final Integer CACHE_THRESHOLD = 1;
+ // 纾ㄨ竟鍙傛暟鎹㈢畻鐜�
+ public static final Integer CACHE_RATIO = 2;
+ // 鍗х悊鏈�澶ч暱杈�
+ public static final Integer CACHE_CACHE_WIDTH = 3;
+ // 鍗х悊鏈�澶х煭杈�
+ public static final Integer CACHE_CACHE_HEIGHT = 4;
+ // 纾ㄨ竟浜岀嚎鏈�澶ч暱杈�
+ public static final Integer CACHE_MAX_FIRST_LENGTH = 5;
+ // 纾ㄨ竟浜岀嚎鏈�澶х煭杈�
+ public static final Integer CACHE_MAX_SECOND_LENGTH = 6;
+ // 纾ㄨ竟涓�绾挎渶澶ч暱杈�
+ public static final Integer CACHE_MIN_ONE_FIRST_LENGTH = 7;
+ // 纾ㄨ竟涓�绾挎渶澶х煭杈�
+ public static final Integer CACHE_MIN_ONE_SECOND_LENGTH = 8;
+ // 纾ㄨ竟浜岀嚎鏈�澶ч暱杈�
+ public static final Integer CACHE_MIN_TWO_FIRST_LENGTH = 9;
+ // 纾ㄨ竟浜岀嚎鏈�澶х煭杈�
+ public static final Integer CACHE_MIN_TWO_SECOND_LENGTH = 10;
+ // 鍗х悊鐜荤拑闂撮殭
+ public static final Integer CACHE_GLASS_GAP = 1;
+ // 鍗х悊鏍煎瓙瀹藉害
+ public static final Integer CACHE_CELL_LENGTH = 12;
+ // 鎺掑簭鏂瑰紡
+ public static final Integer CACHE_SEQUENCE_ORDER_FALSE = 13;
+ // 鎺掑簭鏂瑰紡
+ public static final Integer CACHE_SEQUENCE_ORDER_TRUE = 14;
+
+ // 涓�鐐夌幓鐠冨崰鐢ㄦ牸瀛愭暟
+ public static final Integer VERTICAL_MINCOUNT = 15;
+ // 澶ц溅瀹藉害
+ public static final Integer VERTICAL_CAR_WIDTH = 16;
+ // 鏍煎瓙瀹藉害
+ public static final Integer VERTICAL_SLOT_WIDTH = 17;
+ // 杩涚墖杞︽渶澶х幓鐠冩暟
+ public static final Integer VERTICAL_IN_CAR_SIZE = 18;
+ // 鍑虹墖杞︽渶澶х幓鐠冩暟
+ public static final Integer VERTICAL_OUT_CAR_SIZE = 19;
+ // 鐜荤拑闂撮殭
+ public static final Integer VERTICAL_GLASS_GAP = 20;
+ // 閽㈠寲鐐夐暱搴�
+ public static final Integer VERTICAL_X_MAX_SIZE = 21;
+ // 鏍煎瓙鏈�澶ч珮搴�
+ public static final Integer VERTICAL_SLOT_MAX_HEIGHT = 22;
+ // 鏍煎瓙鏈�澶у帤搴�
+ public static final Integer VERTICAL_SLOT_MAXTHICKNESS = 23;
+ // 閽㈠嚭鐩爣浣嶇疆
+ public static final Integer VERTICAL_TEMPERING_OUT_TARGET_POSITION = 24;
+ // 浜哄伐涓嬬墖鐩爣浣嶇疆
+ public static final Integer VERTICAL_ARTIFICIAL_OUT_TARGET_POSITION = 25;
+
+ // 鎺掑簭鏂瑰紡
+ public static final Integer HOLLOW_SEQUENCE_ORDER = 26;
+ // 涓�鐐夌幓鐠冨崰鐢ㄦ牸瀛愭暟
+ public static final Integer HOLLOW_MINCOUNT = 27;
+ // 澶ц溅瀹藉害
+ public static final Integer HOLLOW_CAR_WIDTH = 28;
+ // 鏍煎瓙瀹藉害
+ public static final Integer HOLLOW_SLOT_WIDTH = 29;
+ // 杩涚墖杞︽渶澶х幓鐠冩暟
+ public static final Integer HOLLOW_IN_CAR_SIZE = 30;
+ // 鍑虹墖杞︽渶澶х幓鐠冩暟
+ public static final Integer HOLLOW_OUT_CAR_SIZE = 31;
+ // 鐜荤拑闂撮殭
+ public static final Integer HOLLOW_GLASS_GAP = 32;
+ // 閽㈠寲鐐夐暱搴�
+ public static final Integer HOLLOW_X_MAX_SIZE = 33;
+ // 閽㈠嚭鐩爣浣嶇疆
+ public static final Integer HOLLOW_TEMPERING_OUT_TARGET_POSITION = 34;
+ // 浜哄伐涓嬬墖鐩爣浣嶇疆
+ public static final Integer HOLLOW_ARTIFICIAL_OUT_TARGET_POSITION = 35;
+ // 鏍煎瓙鏈�澶ч珮搴�
+ public static final Integer HOLLOW_SLOT_MAX_HEIGHT = 36;
+ // 鏍煎瓙鏈�澶у帤搴�
+ public static final Integer HOLLOW_SLOT_MAXTHICKNESS = 37;
+
+ // 閽㈠寲鐐夐暱搴�
+ public static final Integer TEMPERING_WIDTH = 38;
+ // 閽㈠寲鐐夊搴�
+ public static final Integer TEMPERING_HEIGHT = 39;
+
+
+
+}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/mesRedisChange.sql b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/mesRedisChange.sql
new file mode 100644
index 0000000..d64efee
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/mesRedisChange.sql
@@ -0,0 +1,63 @@
+-- liquibase formatted sql
+
+-- changeset zt:20250407001
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sys_config' ;
+CREATE TABLE `sys_config` (
+ `id` int NOT NULL AUTO_INCREMENT,
+ `parent_id` int NULL DEFAULT NULL COMMENT '鐖堕厤缃甶d',
+ `config_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '閰嶇疆鍚�',
+ `config_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '閰嶇疆浠ｇ爜',
+ `config_value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '閰嶇疆鍊�',
+ `is_enable` int NULL DEFAULT NULL COMMENT '鏄惁鍚敤',
+ `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 61 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+-- rollback DROP TABLE big_storage_cage;
+
+
+-- changeset zt:20250407001
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM sys_config;
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (1, 1, '閽㈠寲鐐夋暟闃堝��', 'cache_threshold', '11', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:29');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (2, 1, '纾ㄨ竟鍙傛暟鎹㈢畻鐜�', 'cache_ratio', '10', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:26');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (3, 1, '鍗х悊鏈�澶ч暱杈�', 'cache_cacheWidth', '3600', 0, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (4, 1, '鍗х悊鏈�澶х煭杈�', 'cache_cacheHeight', '3000', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (5, 1, '纾ㄨ竟浜岀嚎鏈�澶ч暱杈�', 'cache_max_firstLength', '3500', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (6, 1, '纾ㄨ竟浜岀嚎鏈�澶х煭杈�', 'cache_max_secondLength', '2500', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (7, 1, '纾ㄨ竟涓�绾挎渶澶ч暱杈�', 'cache_min_one_firstLength', '460', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (8, 1, '纾ㄨ竟涓�绾挎渶澶х煭杈�', 'cache_min_one,secondLength', '390', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (9, 1, '纾ㄨ竟浜岀嚎鏈�澶ч暱杈�', 'cache_min_two_firstLength', '300', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (10, 1, '纾ㄨ竟浜岀嚎鏈�澶х煭杈�', 'cache_min_two_secondLength', '300', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (11, 1, '鍗х悊鐜荤拑闂撮殭', 'cache_glassGap', '2500', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (12, 1, '鍗х悊鏍煎瓙瀹藉害', 'cache_cellLength', '2500', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (13, 1, '鎺掑簭鏂瑰紡', 'cache_sequence_order', 'FALSE', 1, '2025-04-07 09:20:04', '2025-04-08 13:43:18');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (14, 2, '鎺掑簭鏂瑰紡', 'cache_sequence_order', 'TRUE', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (15, 2, '涓�鐐夌幓鐠冨崰鐢ㄦ牸瀛愭暟', 'vertical_mincount', '30', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (16, 2, '澶ц溅瀹藉害', 'vertical_carWidth', '6200', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (17, 2, '鏍煎瓙瀹藉害', 'vertical_slotWidth', '6200', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (18, 2, '杩涚墖杞︽渶澶х幓鐠冩暟', 'vertical_inCarSize', '5', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (19, 2, '鍑虹墖杞︽渶澶х幓鐠冩暟', 'vertical_outCarSize', '6', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (20, 2, '鐜荤拑闂撮殭', 'vertical_glassGap', '250', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (21, 2, '閽㈠寲鐐夐暱搴�', 'vertical_xMaxSize', '2800', 0, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (22, 2, '鏍煎瓙鏈�澶ч珮搴�', 'vertical_slotMaxHeight', '2500', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (23, 2, '鏍煎瓙鏈�澶у帤搴�', 'vertical_slotMaxthickness', '12', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (24, 2, '閽㈠嚭鐩爣浣嶇疆', 'vertical_temperingOutTargetPosition', '930', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (25, 2, '浜哄伐涓嬬墖鐩爣浣嶇疆', 'vertical_artificialOutTargetPosition', '931', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (26, 3, '鎺掑簭鏂瑰紡', 'hollow_sequence,order', 'TRUE', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (27, 3, '涓�鐐夌幓鐠冨崰鐢ㄦ牸瀛愭暟', 'hollow_mincount', '30', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (28, 3, '澶ц溅瀹藉害', 'hollow_carWidth', '6200', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (29, 3, '鏍煎瓙瀹藉害', 'hollow_slotWidth', '6200', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (30, 3, '杩涚墖杞︽渶澶х幓鐠冩暟', 'hollow_inCarSize', '5', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (31, 3, '鍑虹墖杞︽渶澶х幓鐠冩暟', 'hollow_outCarSize', '6', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (32, 3, '鐜荤拑闂撮殭', 'hollow_glassGap', '250', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (33, 3, '閽㈠寲鐐夐暱搴�', 'hollow_xMaxSize', '2800', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (34, 3, '閽㈠嚭鐩爣浣嶇疆', 'hollow_temperingOutTargetPosition', '930', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (35, 3, '浜哄伐涓嬬墖鐩爣浣嶇疆', 'hollow_artificialOutTargetPosition', '931', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (36, 3, '鏍煎瓙鏈�澶ч珮搴�', 'hollow_slotMaxHeight', '2500', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (37, 3, '鏍煎瓙鏈�澶у帤搴�', 'hollow_slotMaxthickness', '12', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (38, 4, '閽㈠寲鐐夐暱搴�', 'tempering_width', '2800', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+INSERT INTO `north_glass_mes`.`sys_config` (`id`, `parent_id`, `config_name`, `config_code`, `config_value`, `is_enable`, `create_time`, `update_time`) VALUES (39, 4, '閽㈠寲鐐夊搴�', 'tempering_height', '5000', 1, '2025-04-07 09:20:04', '2025-04-08 13:42:00');
+
+
--
Gitblit v1.8.0