From 4f966da6047cdcd9c53e254c1f1c7bdd70af0b34 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期一, 21 四月 2025 10:08:18 +0800 Subject: [PATCH] 1、卧式理片笼配置参数由配置yml文件改为数据库配置表获取 2、磨边后参数改造,解决plc查询数据异常问题 3、大理片笼配置参数由配置yml文件改为数据库配置表获取 4、钢化配置参数由配置yml文件改为数据库配置表获取 5、配置参数常量类配置修改,提供获取配置参数的方法 --- hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/ConstSysConfig.java | 61 +++++++++++++----------------- 1 files changed, 26 insertions(+), 35 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 index 12733a2..44f9f29 100644 --- 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 @@ -8,43 +8,43 @@ */ 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_GLASS_GAP = 11; // 鍗х悊鏍煎瓙瀹藉害 public static final Integer CACHE_CELL_LENGTH = 12; - // 鎺掑簭鏂瑰紡 - public static final Integer CACHE_SEQUENCE_ORDER_FALSE = 13; - // 鎺掑簭鏂瑰紡 + // 浜屽彿绾挎渶澶у帤搴�(涓嶅寘鎷�) + public static final Integer CACHE_MAX_THICKNESS = 13; + + // 閽㈠寲鍑虹墖鎺掑簭鏂瑰紡 public static final Integer CACHE_SEQUENCE_ORDER_TRUE = 14; - // 涓�鐐夌幓鐠冨崰鐢ㄦ牸瀛愭暟 - public static final Integer VERTICAL_MINCOUNT = 15; + // 涓�鐐夌幓鐠冨崰鐢ㄦ牸瀛愭暟锛堣皟搴︼級 + public static final Integer VERTICAL_MIN_COUNT = 15; // 澶ц溅瀹藉害 public static final Integer VERTICAL_CAR_WIDTH = 16; // 鏍煎瓙瀹藉害 public static final Integer VERTICAL_SLOT_WIDTH = 17; - // 杩涚墖杞︽渶澶х幓鐠冩暟 + // 杩涚墖杞︽渶澶х幓鐠冩暟-1 public static final Integer VERTICAL_IN_CAR_SIZE = 18; // 鍑虹墖杞︽渶澶х幓鐠冩暟 public static final Integer VERTICAL_OUT_CAR_SIZE = 19; @@ -55,41 +55,32 @@ // 鏍煎瓙鏈�澶ч珮搴� public static final Integer VERTICAL_SLOT_MAX_HEIGHT = 22; // 鏍煎瓙鏈�澶у帤搴� - public static final Integer VERTICAL_SLOT_MAXTHICKNESS = 23; + public static final Integer VERTICAL_SLOT_MAX_THICKNESS = 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_CAR_WIDTH = 26; // 鏍煎瓙瀹藉害 - public static final Integer HOLLOW_SLOT_WIDTH = 29; - // 杩涚墖杞︽渶澶х幓鐠冩暟 - public static final Integer HOLLOW_IN_CAR_SIZE = 30; + public static final Integer HOLLOW_SLOT_WIDTH = 27; + // 杩涚墖杞︽渶澶х幓鐠冩暟-1 + public static final Integer HOLLOW_IN_CAR_SIZE = 28; // 鍑虹墖杞︽渶澶х幓鐠冩暟 - public static final Integer HOLLOW_OUT_CAR_SIZE = 31; + public static final Integer HOLLOW_OUT_CAR_SIZE = 29; // 鐜荤拑闂撮殭 - 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_GLASS_GAP = 30; // 鏍煎瓙鏈�澶ч珮搴� - public static final Integer HOLLOW_SLOT_MAX_HEIGHT = 36; + public static final Integer HOLLOW_SLOT_MAX_HEIGHT = 31; // 鏍煎瓙鏈�澶у帤搴� - public static final Integer HOLLOW_SLOT_MAXTHICKNESS = 37; + public static final Integer HOLLOW_SLOT_MAX_THICKNESS = 32; // 閽㈠寲鐐夐暱搴� - public static final Integer TEMPERING_WIDTH = 38; + public static final Integer TEMPERING_WIDTH = 33; // 閽㈠寲鐐夊搴� - public static final Integer TEMPERING_HEIGHT = 39; + public static final Integer TEMPERING_HEIGHT = 34; -- Gitblit v1.8.0