From 2265a4ba25b765d08795018f78ac9bceb87e4f45 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期一, 13 四月 2026 16:23:28 +0800
Subject: [PATCH] 屏蔽AI
---
src/main/java/com/zy/ai/mcp/tool/WcsMcpTools.java | 10
src/main/java/com/zy/ai/service/impl/MainProcessPseudocodeServiceImpl.java | 512 +++++++++++++++++++++++++++------------------------
src/main/java/com/zy/ai/mcp/service/impl/WcsDataFacadeImpl.java | 14
src/main/java/com/zy/ai/mcp/service/WcsDataFacade.java | 2
src/main/java/com/zy/ai/timer/MakeMainProcessPseudocodeScheduler.java | 3
pom.xml | 16 +
src/main/resources/application.yml | 22 +-
7 files changed, 310 insertions(+), 269 deletions(-)
diff --git a/pom.xml b/pom.xml
index a95a83f..cfaf44c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<groupId>com.zy</groupId>
<artifactId>wcs</artifactId>
<version>1.0.0</version>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<properties>
<java.version>17</java.version>
@@ -205,6 +205,20 @@
<!-- </configuration>-->
</plugin>
</plugins>
+ <resources>
+ <!-- 1. 棣栧厛锛岃Maven澶勭悊鍘熸湁鐨剅esources鐩綍 -->
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ </resource>
+ <!-- 2. 鍏舵锛屽皢webapp鐩綍涓嬬殑鏂囦欢锛屽鍒跺埌META-INF/resources鐩綍涓� -->
+ <resource>
+ <directory>${basedir}/src/main/webapp</directory>
+ <targetPath>META-INF/resources</targetPath>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
diff --git a/src/main/java/com/zy/ai/mcp/service/WcsDataFacade.java b/src/main/java/com/zy/ai/mcp/service/WcsDataFacade.java
index 8edf358..2bc9796 100644
--- a/src/main/java/com/zy/ai/mcp/service/WcsDataFacade.java
+++ b/src/main/java/com/zy/ai/mcp/service/WcsDataFacade.java
@@ -18,5 +18,5 @@
Object getSystemConfig(JSONObject args);
- Object getSystemPseudocode(JSONObject args);
+// Object getSystemPseudocode(JSONObject args);
}
diff --git a/src/main/java/com/zy/ai/mcp/service/impl/WcsDataFacadeImpl.java b/src/main/java/com/zy/ai/mcp/service/impl/WcsDataFacadeImpl.java
index d7fb5e7..76b5863 100644
--- a/src/main/java/com/zy/ai/mcp/service/impl/WcsDataFacadeImpl.java
+++ b/src/main/java/com/zy/ai/mcp/service/impl/WcsDataFacadeImpl.java
@@ -46,8 +46,8 @@
private WrkMastService wrkMastService;
@Autowired
private ConfigService configService;
- @Autowired
- private MainProcessPseudocodeService mainProcessPseudocodeService;
+// @Autowired
+// private MainProcessPseudocodeService mainProcessPseudocodeService;
@Override
public Object getCrnDeviceStatus(JSONObject args) {
@@ -278,11 +278,11 @@
return data;
}
- @Override
- public Object getSystemPseudocode(JSONObject args) {
- boolean refresh = optBool(args, "refresh", false);
- return mainProcessPseudocodeService.queryMainProcessPseudocode(refresh);
- }
+// @Override
+// public Object getSystemPseudocode(JSONObject args) {
+// boolean refresh = optBool(args, "refresh", false);
+// return mainProcessPseudocodeService.queryMainProcessPseudocode(refresh);
+// }
// --------- helpers ---------
diff --git a/src/main/java/com/zy/ai/mcp/tool/WcsMcpTools.java b/src/main/java/com/zy/ai/mcp/tool/WcsMcpTools.java
index 2f7c72b..302bbc9 100644
--- a/src/main/java/com/zy/ai/mcp/tool/WcsMcpTools.java
+++ b/src/main/java/com/zy/ai/mcp/tool/WcsMcpTools.java
@@ -87,11 +87,11 @@
return wcsDataFacade.getSystemConfig(json());
}
- @Tool(name = "system_get_main_process_pseudocode", description = "鏌ヨ褰撳墠WCS绯荤粺涓绘祦绋嬩吉浠ｇ爜")
- public Object getSystemPseudocode(
- @ToolParam(description = "鏄惁寮哄埗閲嶆柊鐢熸垚浼唬鐮侊紝榛樿 false", required = false) Boolean refresh) {
- return wcsDataFacade.getSystemPseudocode(json().fluentPut("refresh", refresh));
- }
+// @Tool(name = "system_get_main_process_pseudocode", description = "鏌ヨ褰撳墠WCS绯荤粺涓绘祦绋嬩吉浠ｇ爜")
+// public Object getSystemPseudocode(
+// @ToolParam(description = "鏄惁寮哄埗閲嶆柊鐢熸垚浼唬鐮侊紝榛樿 false", required = false) Boolean refresh) {
+// return wcsDataFacade.getSystemPseudocode(json().fluentPut("refresh", refresh));
+// }
private JSONObject json() {
return new JSONObject();
diff --git a/src/main/java/com/zy/ai/service/impl/MainProcessPseudocodeServiceImpl.java b/src/main/java/com/zy/ai/service/impl/MainProcessPseudocodeServiceImpl.java
index c8dea92..d4a4427 100644
--- a/src/main/java/com/zy/ai/service/impl/MainProcessPseudocodeServiceImpl.java
+++ b/src/main/java/com/zy/ai/service/impl/MainProcessPseudocodeServiceImpl.java
@@ -19,150 +19,150 @@
import java.util.List;
@Service("mainProcessPseudocodeService")
-public class MainProcessPseudocodeServiceImpl implements MainProcessPseudocodeService {
+public class MainProcessPseudocodeServiceImpl {
private static final long SUCCESS_CACHE_SECONDS = 60 * 60 * 24;
private static final long FAILURE_CACHE_SECONDS = 60 * 10;
private static final String FAILURE_TEXT = "AI鐢熸垚浼唬鐮佸け璐�";
- private static final String PSEUDOCODE_SYSTEM_PROMPT = """
- 浣犵幇鍦ㄦ槸涓�鍚嶉珮绾� Java 鏋舵瀯甯堝吋浼唬鐮佽浆鎹笓瀹讹紝涓撻棬璐熻矗鎶婂鏉傜殑 Java 浠ｇ爜杞崲鎴愮粨鏋勬竻鏅般�侀�傚悎澶фā鍨嬮槄璇讳笌鎺ㄧ悊鐨勪吉浠ｇ爜銆�
-
- 璇蜂弗鏍奸伒瀹堜互涓嬭姹傚伐浣滐細
-
- 鏍稿績鐩爣
-
- 杈撳叆鏄竴娈垫垨澶氭 Java 浠ｇ爜銆�
-
- 杈撳嚭鏄竴娈典汉绫诲彲璇汇�侀�昏緫娓呮櫚銆佸敖閲忚瑷�涓珛鐨勪吉浠ｇ爜銆�
-
- 杩欎唤浼唬鐮佸皢琚敤浣滃悗缁ぇ妯″瀷鎻愰棶鐨勨�滃弬鑰冩弿杩扳�濓紝鎵�浠ヨ锛�
-
- 淇濈暀鍏抽敭涓氬姟閫昏緫鍜屽垽鏂潯浠讹紱
-
- 寮卞寲璇█缁嗚妭锛堝鍏蜂綋搴撱�佹敞瑙ｃ�佹鏋剁粏鑺傦級锛�
-
- 鐢ㄨ嚜鐒惰瑷� + 绠�娲佹祦绋嬬粨鏋勶紝甯姪澶фā鍨嬪揩閫熺悊瑙ｄ唬鐮佹剰鍥俱��
-
- 椋庢牸瑕佹眰
-
- 浣跨敤涓枃鎻忚堪閫昏緫锛屼絾鍙互淇濈暀灏戦噺鍏抽敭鑻辨枃鏍囪瘑锛堜緥濡傜被鍚嶃�佹柟娉曞悕銆佺姸鎬佹灇涓撅級浠ヤ究璺熶唬鐮佸搴斻��
-
- 浼唬鐮佽鍒嗗眰鍒嗗潡锛屽敖閲忔寜锛�
-
- 绫昏亴璐ｈ鏄�
-
- 閲嶈瀛楁 / 鍏ㄥ眬鍙橀噺璇存槑
-
- 姣忎釜鍏紑鏂规硶 / 鏍稿績绉佹湁鏂规硶鐨勪吉浠ｇ爜
-
- 閫昏緫涓婁娇鐢ㄧ被浼硷細
-
- 濡傛灉 ... 鍒� ...
-
- 鍚﹀垯濡傛灉 ...
-
- 寰幆閬嶅巻鍒楄〃 ...
-
- 璋冪敤鏈嶅姟/鏂规硶: ...
-
- 杩斿洖 ...
-
- 涓嶈拷姹備弗鏍艰娉曪紝鍙拷姹傛槗鎳傚拰鍑嗙‘銆�
-
- 淇濈暀淇℃伅 & 鎶借薄淇℃伅
-
- 蹇呴』淇濈暀锛�
-
- 鍏抽敭涓氬姟鍚箟锛堜緥濡傗�滅敓鎴愬叆搴撲换鍔♀�濄�佲�滄鏌ュ爢鍨涙満浠诲姟鏄惁瀹屾垚鈥濓級
-
- 鍏抽敭鏉′欢鍒ゆ柇锛堢姸鎬佸瓧娈点�佹灇涓俱�侀噸瑕侀厤缃紑鍏筹級
-
- 閲嶈鏁版嵁娴佸悜锛堜粠鍝噷璇绘暟鎹�佸啓鍒板摢閲屻�佽皟鐢ㄤ簡鍝簺鏈嶅姟锛�
-
- 涓庡閮ㄧ郴缁熶氦浜掞紙濡� HTTP 璋冪敤 WMS銆佸啓 Redis 閿併�佸啓鏁版嵁搴擄級
-
- 鍙互鎶借薄鎴栫渷鐣ワ細
-
- 鏃ュ織鎵撳嵃鐨勫叿浣撴牸寮忥紝鍙繚鐣欌�滆褰曟棩蹇楋細xxx鈥濆嵆鍙紱
-
- 鍏蜂綋妗嗘灦娉ㄨВ锛堝 @Component, @Autowired 绛夛級锛�
-
- 娉涘瀷銆佸紓甯告爤缁嗚妭銆佸伐鍏风被鍐呴儴瀹炵幇锛�
-
- 缁撴瀯妯℃澘锛堜紭鍏堥伒寰級
-
- 瀵逛簬涓�娈佃緝澶х殑 Java 绫伙紝璇锋寜浠ヤ笅缁撴瀯杈撳嚭浼唬鐮侊細
-
- 绫绘暣浣撹鏄�
-
- 绠�瑕佽鏄庤繖涓被鐨勭敤閫斿拰鍦ㄧ郴缁熶腑鐨勮鑹层��
-
- 閲嶈瀛楁 / 閰嶇疆璇存槑
-
- 鍒楀嚭鍏抽敭闈欐�佸彉閲� / 閰嶇疆椤� / 鐘舵�佺紦瀛橈紝骞剁敤涓�琛岃В閲婂畠浠殑鍚箟銆�
-
- 涓绘祦绋嬫柟娉曪紙渚嬪 run()锛�
-
- 鐢ㄦ湁搴忓垪琛ㄦ垨浼唬鐮侊紝鎸夎皟鐢ㄩ『搴忔弿杩颁富瑕佹楠ゃ��
-
- 姣忎釜鏍稿績绉佹湁鏂规硶
-
- 瀵逛簬姣忎釜鍏抽敭鏂规硶锛�
-
- 鍏堢敤涓�琛屼腑鏂囨�荤粨鍔熻兘锛�
-
- 鍐嶇粰鍑轰吉浠ｇ爜娴佺▼锛堟潯浠躲�佸惊鐜�佸叧閿皟鐢級锛�
-
- 涓庡閮ㄧ郴缁熶氦浜掔殑璇存槑
-
- 鍗曠嫭寮鸿皟鏈夊摢浜涘湴鏂硅皟鐢ㄤ簡澶栭儴鏈嶅姟锛圚TTP銆佹秷鎭槦鍒椼�佹暟鎹簱銆丷edis 绛夛級銆�
-
- 杈撳嚭鏍煎紡瑕佹眰
-
- 浣跨敤 Markdown 缁撴瀯锛屾柟渚垮鍒剁粰鍏朵粬澶фā鍨嬶細
-
- 鐢� ## 鏍囬鍖哄垎鈥滅被璇存槑鈥濄�佲�滀富娴佺▼浼唬鐮佲�濄�佲�滄柟娉曚吉浠ｇ爜鈥濈瓑閮ㄥ垎锛�
-
- 浼唬鐮佸潡鍙互浣跨敤缂╄繘鍜岄」鐩鍙凤紝鎴栫敤 pseudo 浠ｇ爜鍧� 鍖呰９锛�
-
- 涓嶈鐩存帴閫愯缈昏瘧浠ｇ爜锛岃�屾槸鍋氭娊璞″拰鏁寸悊锛�
-
- 涓嶈杈撳嚭鏃犲叧鏂囨湰锛屼緥濡傞亾姝夈�佸瘨鏆勬垨涓庝换鍔℃棤鍏崇殑瑙ｉ噴銆�
-
- 浼唬鐮佺ず渚嬮鏍硷紙绀烘剰锛�
-
- 渚嬪褰撹緭鍏ヤ竴涓� run() 鏂规硶鏃讹紝鏈熸湜浣犵殑杈撳嚭椋庢牸绫讳技锛�
-
- 鍑芥暟 run():
- 璇诲彇閰嶇疆 enableFake, fakeRealTaskRequestWms
- 濡傛灉 enableFake == "Y":
- 璋冪敤 checkInStationHasTask() 妫�娴嬪叆搴撶珯骞剁敓鎴愪豢鐪熺珯鐐规暟鎹�
- 濡傛灉 fakeRealTaskRequestWms == "N":
- 璋冪敤 generateFakeInTask() 鐢熸垚鏈湴浠跨湡鍏ュ簱浠诲姟
- 璋冪敤 generateFakeOutTask() 鐢熸垚鏈湴浠跨湡鍑哄簱浠诲姟
- 璁＄畻鎵�鏈夌珯鐐圭殑鍋滅暀鏃堕棿 calcAllStationStayTime()
- 妫�鏌ュ嚭搴撶珯鐐规槸鍚﹁秴鏃跺苟閲嶇疆 checkOutStationStayTimeOut()
- 妫�鏌ュ叆搴撶珯鐐硅揣鐗╂槸鍚﹀凡琚爢鍨涙満鍙栬蛋 checkInStationCrnTake()
- 濡傛灉 fakeRealTaskRequestWms == "Y":
- 璋冪敤 generateStoreWrkFile() 璇锋眰 WMS 鐢熸垚鐪熷疄浠诲姟
- 璋冪敤 crnOperateUtils.crnIoExecute() 鎵ц鍫嗗灈鏈轰换鍔�
- 璋冪敤 crnIoExecuteFinish() 澶勭悊鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勭姸鎬佹洿鏂板拰浠跨湡绔欑偣鐢熸垚
- 璋冪敤 stationOperateProcessUtils.submitStationInTasks(...) 鎸� lane 鎻愪氦杈撻�佺珯鍏ュ簱浠诲姟
- 璋冪敤 stationOperateProcessUtils.stationOutExecute() 鎵ц杈撻�佺珯鍑哄簱浠诲姟
- 璋冪敤 stationOperateProcessUtils.stationOutExecuteFinish() 妫�鏌ヨ緭閫佺珯鍑哄簱浠诲姟瀹屾垚
-
- 瀵硅緭鍏ョ殑瑕佹眰
-
- 濡傛灉鐢ㄦ埛缁欏嚭鐨勬槸澶氭浠ｇ爜鎴栧彧缁欏嚭鐗囨锛�
-
- 鍏堟帹鏂繖娈典唬鐮佺殑鑱岃矗锛�
-
- 鍐嶆寜浣犺兘鐞嗚В鍒扮殑鑼冨洿杩涜浼唬鐮佽浆鎹紱
-
- 濡傛灉瀛樺湪鏄庢樉缂哄け鐨勭被/鏂规硶锛屽彧闇�鍦ㄤ吉浠ｇ爜涓敤鈥滆皟鐢� XXX锛堝叿浣撻�昏緫鐣ワ級鈥濇爣璁板嵆鍙��
-
- 璇峰缁堜互銆岃鍚庣画澶фā鍨嬭兘鐪嬫噦杩欐浠ｇ爜閫昏緫骞跺熀浜庝吉浠ｇ爜杩涜鎺ㄧ悊鍜屾彁闂�嶄负鏈�楂樹紭鍏堢骇鏉ョ粍缁囦綘鐨勮緭鍑恒��
- """;
+ private static final String PSEUDOCODE_SYSTEM_PROMPT = "";//"
+// 浣犵幇鍦ㄦ槸涓�鍚嶉珮绾� Java 鏋舵瀯甯堝吋浼唬鐮佽浆鎹笓瀹讹紝涓撻棬璐熻矗鎶婂鏉傜殑 Java 浠ｇ爜杞崲鎴愮粨鏋勬竻鏅般�侀�傚悎澶фā鍨嬮槄璇讳笌鎺ㄧ悊鐨勪吉浠ｇ爜銆�
+//
+// 璇蜂弗鏍奸伒瀹堜互涓嬭姹傚伐浣滐細
+//
+// 鏍稿績鐩爣
+//
+// 杈撳叆鏄竴娈垫垨澶氭 Java 浠ｇ爜銆�
+//
+// 杈撳嚭鏄竴娈典汉绫诲彲璇汇�侀�昏緫娓呮櫚銆佸敖閲忚瑷�涓珛鐨勪吉浠ｇ爜銆�
+//
+// 杩欎唤浼唬鐮佸皢琚敤浣滃悗缁ぇ妯″瀷鎻愰棶鐨勨�滃弬鑰冩弿杩扳�濓紝鎵�浠ヨ锛�
+//
+// 淇濈暀鍏抽敭涓氬姟閫昏緫鍜屽垽鏂潯浠讹紱
+//
+// 寮卞寲璇█缁嗚妭锛堝鍏蜂綋搴撱�佹敞瑙ｃ�佹鏋剁粏鑺傦級锛�
+//
+// 鐢ㄨ嚜鐒惰瑷� + 绠�娲佹祦绋嬬粨鏋勶紝甯姪澶фā鍨嬪揩閫熺悊瑙ｄ唬鐮佹剰鍥俱��
+//
+// 椋庢牸瑕佹眰
+//
+// 浣跨敤涓枃鎻忚堪閫昏緫锛屼絾鍙互淇濈暀灏戦噺鍏抽敭鑻辨枃鏍囪瘑锛堜緥濡傜被鍚嶃�佹柟娉曞悕銆佺姸鎬佹灇涓撅級浠ヤ究璺熶唬鐮佸搴斻��
+//
+// 浼唬鐮佽鍒嗗眰鍒嗗潡锛屽敖閲忔寜锛�
+//
+// 绫昏亴璐ｈ鏄�
+//
+// 閲嶈瀛楁 / 鍏ㄥ眬鍙橀噺璇存槑
+//
+// 姣忎釜鍏紑鏂规硶 / 鏍稿績绉佹湁鏂规硶鐨勪吉浠ｇ爜
+//
+// 閫昏緫涓婁娇鐢ㄧ被浼硷細
+//
+// 濡傛灉 ... 鍒� ...
+//
+// 鍚﹀垯濡傛灉 ...
+//
+// 寰幆閬嶅巻鍒楄〃 ...
+//
+// 璋冪敤鏈嶅姟/鏂规硶: ...
+//
+// 杩斿洖 ...
+//
+// 涓嶈拷姹備弗鏍艰娉曪紝鍙拷姹傛槗鎳傚拰鍑嗙‘銆�
+//
+// 淇濈暀淇℃伅 & 鎶借薄淇℃伅
+//
+// 蹇呴』淇濈暀锛�
+//
+// 鍏抽敭涓氬姟鍚箟锛堜緥濡傗�滅敓鎴愬叆搴撲换鍔♀�濄�佲�滄鏌ュ爢鍨涙満浠诲姟鏄惁瀹屾垚鈥濓級
+//
+// 鍏抽敭鏉′欢鍒ゆ柇锛堢姸鎬佸瓧娈点�佹灇涓俱�侀噸瑕侀厤缃紑鍏筹級
+//
+// 閲嶈鏁版嵁娴佸悜锛堜粠鍝噷璇绘暟鎹�佸啓鍒板摢閲屻�佽皟鐢ㄤ簡鍝簺鏈嶅姟锛�
+//
+// 涓庡閮ㄧ郴缁熶氦浜掞紙濡� HTTP 璋冪敤 WMS銆佸啓 Redis 閿併�佸啓鏁版嵁搴擄級
+//
+// 鍙互鎶借薄鎴栫渷鐣ワ細
+//
+// 鏃ュ織鎵撳嵃鐨勫叿浣撴牸寮忥紝鍙繚鐣欌�滆褰曟棩蹇楋細xxx鈥濆嵆鍙紱
+//
+// 鍏蜂綋妗嗘灦娉ㄨВ锛堝 @Component, @Autowired 绛夛級锛�
+//
+// 娉涘瀷銆佸紓甯告爤缁嗚妭銆佸伐鍏风被鍐呴儴瀹炵幇锛�
+//
+// 缁撴瀯妯℃澘锛堜紭鍏堥伒寰級
+//
+// 瀵逛簬涓�娈佃緝澶х殑 Java 绫伙紝璇锋寜浠ヤ笅缁撴瀯杈撳嚭浼唬鐮侊細
+//
+// 绫绘暣浣撹鏄�
+//
+// 绠�瑕佽鏄庤繖涓被鐨勭敤閫斿拰鍦ㄧ郴缁熶腑鐨勮鑹层��
+//
+// 閲嶈瀛楁 / 閰嶇疆璇存槑
+//
+// 鍒楀嚭鍏抽敭闈欐�佸彉閲� / 閰嶇疆椤� / 鐘舵�佺紦瀛橈紝骞剁敤涓�琛岃В閲婂畠浠殑鍚箟銆�
+//
+// 涓绘祦绋嬫柟娉曪紙渚嬪 run()锛�
+//
+// 鐢ㄦ湁搴忓垪琛ㄦ垨浼唬鐮侊紝鎸夎皟鐢ㄩ『搴忔弿杩颁富瑕佹楠ゃ��
+//
+// 姣忎釜鏍稿績绉佹湁鏂规硶
+//
+// 瀵逛簬姣忎釜鍏抽敭鏂规硶锛�
+//
+// 鍏堢敤涓�琛屼腑鏂囨�荤粨鍔熻兘锛�
+//
+// 鍐嶇粰鍑轰吉浠ｇ爜娴佺▼锛堟潯浠躲�佸惊鐜�佸叧閿皟鐢級锛�
+//
+// 涓庡閮ㄧ郴缁熶氦浜掔殑璇存槑
+//
+// 鍗曠嫭寮鸿皟鏈夊摢浜涘湴鏂硅皟鐢ㄤ簡澶栭儴鏈嶅姟锛圚TTP銆佹秷鎭槦鍒椼�佹暟鎹簱銆丷edis 绛夛級銆�
+//
+// 杈撳嚭鏍煎紡瑕佹眰
+//
+// 浣跨敤 Markdown 缁撴瀯锛屾柟渚垮鍒剁粰鍏朵粬澶фā鍨嬶細
+//
+// 鐢� ## 鏍囬鍖哄垎鈥滅被璇存槑鈥濄�佲�滀富娴佺▼浼唬鐮佲�濄�佲�滄柟娉曚吉浠ｇ爜鈥濈瓑閮ㄥ垎锛�
+//
+// 浼唬鐮佸潡鍙互浣跨敤缂╄繘鍜岄」鐩鍙凤紝鎴栫敤 pseudo 浠ｇ爜鍧� 鍖呰９锛�
+//
+// 涓嶈鐩存帴閫愯缈昏瘧浠ｇ爜锛岃�屾槸鍋氭娊璞″拰鏁寸悊锛�
+//
+// 涓嶈杈撳嚭鏃犲叧鏂囨湰锛屼緥濡傞亾姝夈�佸瘨鏆勬垨涓庝换鍔℃棤鍏崇殑瑙ｉ噴銆�
+//
+// 浼唬鐮佺ず渚嬮鏍硷紙绀烘剰锛�
+//
+// 渚嬪褰撹緭鍏ヤ竴涓� run() 鏂规硶鏃讹紝鏈熸湜浣犵殑杈撳嚭椋庢牸绫讳技锛�
+//
+// 鍑芥暟 run():
+// 璇诲彇閰嶇疆 enableFake, fakeRealTaskRequestWms
+// 濡傛灉 enableFake == "Y":
+// 璋冪敤 checkInStationHasTask() 妫�娴嬪叆搴撶珯骞剁敓鎴愪豢鐪熺珯鐐规暟鎹�
+// 濡傛灉 fakeRealTaskRequestWms == "N":
+// 璋冪敤 generateFakeInTask() 鐢熸垚鏈湴浠跨湡鍏ュ簱浠诲姟
+// 璋冪敤 generateFakeOutTask() 鐢熸垚鏈湴浠跨湡鍑哄簱浠诲姟
+// 璁＄畻鎵�鏈夌珯鐐圭殑鍋滅暀鏃堕棿 calcAllStationStayTime()
+// 妫�鏌ュ嚭搴撶珯鐐规槸鍚﹁秴鏃跺苟閲嶇疆 checkOutStationStayTimeOut()
+// 妫�鏌ュ叆搴撶珯鐐硅揣鐗╂槸鍚﹀凡琚爢鍨涙満鍙栬蛋 checkInStationCrnTake()
+// 濡傛灉 fakeRealTaskRequestWms == "Y":
+// 璋冪敤 generateStoreWrkFile() 璇锋眰 WMS 鐢熸垚鐪熷疄浠诲姟
+// 璋冪敤 crnOperateUtils.crnIoExecute() 鎵ц鍫嗗灈鏈轰换鍔�
+// 璋冪敤 crnIoExecuteFinish() 澶勭悊鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勭姸鎬佹洿鏂板拰浠跨湡绔欑偣鐢熸垚
+// 璋冪敤 stationOperateProcessUtils.submitStationInTasks(...) 鎸� lane 鎻愪氦杈撻�佺珯鍏ュ簱浠诲姟
+// 璋冪敤 stationOperateProcessUtils.stationOutExecute() 鎵ц杈撻�佺珯鍑哄簱浠诲姟
+// 璋冪敤 stationOperateProcessUtils.stationOutExecuteFinish() 妫�鏌ヨ緭閫佺珯鍑哄簱浠诲姟瀹屾垚
+//
+// 瀵硅緭鍏ョ殑瑕佹眰
+//
+// 濡傛灉鐢ㄦ埛缁欏嚭鐨勬槸澶氭浠ｇ爜鎴栧彧缁欏嚭鐗囨锛�
+//
+// 鍏堟帹鏂繖娈典唬鐮佺殑鑱岃矗锛�
+//
+// 鍐嶆寜浣犺兘鐞嗚В鍒扮殑鑼冨洿杩涜浼唬鐮佽浆鎹紱
+//
+// 濡傛灉瀛樺湪鏄庢樉缂哄け鐨勭被/鏂规硶锛屽彧闇�鍦ㄤ吉浠ｇ爜涓敤鈥滆皟鐢� XXX锛堝叿浣撻�昏緫鐣ワ級鈥濇爣璁板嵆鍙��
+//
+// 璇峰缁堜互銆岃鍚庣画澶фā鍨嬭兘鐪嬫噦杩欐浠ｇ爜閫昏緫骞跺熀浜庝吉浠ｇ爜杩涜鎺ㄧ悊鍜屾彁闂�嶄负鏈�楂樹紭鍏堢骇鏉ョ粍缁囦綘鐨勮緭鍑恒��
+// """;
@Value("${mainProcessPlugin}")
private String mainProcessPlugin;
@@ -172,112 +172,140 @@
@Autowired
private RedisUtil redisUtil;
- @Override
- public JSONObject queryMainProcessPseudocode(boolean refresh) {
- String cacheKey = RedisKeyType.MAIN_PROCESS_PSEUDOCODE.key;
- String cached = trimToNull(redisUtil.get(cacheKey));
- String pseudocode = cached;
- String status = "cached";
- String message = null;
- boolean generatedFresh = false;
+// @Override
+// public JSONObject queryMainProcessPseudocode(boolean refresh) {
+// String cacheKey = RedisKeyType.MAIN_PROCESS_PSEUDOCODE.key;
+// String cached = trimToNull(redisUtil.get(cacheKey));
+// String pseudocode = cached;
+// String status = "cached";
+// String message = null;
+// boolean generatedFresh = false;
+//
+// if (refresh || pseudocode == null) {
+// String generated = generateAndCachePseudocode();
+// if (generated != null) {
+// pseudocode = generated;
+// generatedFresh = true;
+// status = refresh ? "refreshed" : "generated";
+// } else if (cached != null) {
+// pseudocode = cached;
+// status = "fallback_cached";
+// message = "閲嶆柊鐢熸垚澶辫触锛岃繑鍥炵紦瀛樹腑鐨勪吉浠ｇ爜";
+// } else {
+// pseudocode = FAILURE_TEXT;
+// status = "failed";
+// message = FAILURE_TEXT;
+// redisUtil.set(cacheKey, FAILURE_TEXT, FAILURE_CACHE_SECONDS);
+// News.info(FAILURE_TEXT);
+// }
+// }
+//
+// JSONObject result = new JSONObject();
+// result.put("mainProcessPlugin", resolvePlugin());
+// result.put("mainProcessPluginClass", resolvePluginClassName());
+// result.put("refreshRequested", refresh);
+// result.put("generatedFresh", generatedFresh);
+// result.put("cacheHit", !generatedFresh && ("cached".equals(status) || "fallback_cached".equals(status)));
+// result.put("status", status);
+// result.put("expireSeconds", redisUtil.getExpire(cacheKey));
+// result.put("message", message);
+// result.put("pseudocode", pseudocode);
+// return result;
+// }
- if (refresh || pseudocode == null) {
- String generated = generateAndCachePseudocode();
- if (generated != null) {
- pseudocode = generated;
- generatedFresh = true;
- status = refresh ? "refreshed" : "generated";
- } else if (cached != null) {
- pseudocode = cached;
- status = "fallback_cached";
- message = "閲嶆柊鐢熸垚澶辫触锛岃繑鍥炵紦瀛樹腑鐨勪吉浠ｇ爜";
- } else {
- pseudocode = FAILURE_TEXT;
- status = "failed";
- message = FAILURE_TEXT;
- redisUtil.set(cacheKey, FAILURE_TEXT, FAILURE_CACHE_SECONDS);
- News.info(FAILURE_TEXT);
- }
- }
+// private String generateAndCachePseudocode() {
+// String code = loadSourceBundle();
+// if (code == null || code.isEmpty()) {
+// return null;
+// }
+//
+// List<ChatCompletionRequest.Message> messages = new ArrayList<>();
+// ChatCompletionRequest.Message system = new ChatCompletionRequest.Message();
+// system.setRole("system");
+// system.setContent(PSEUDOCODE_SYSTEM_PROMPT);
+// messages.add(system);
+//
+// ChatCompletionRequest.Message user = new ChatCompletionRequest.Message();
+// user.setRole("user");
+// user.setContent("涓绘祦绋嬫彃浠剁被婧愪唬鐮侊細\n\n" + code);
+// messages.add(user);
+//
+// try {
+// String result = trimToNull(llmChatService.chat(messages, 0.2, 2048));
+// if (result == null) {
+// return null;
+// }
+// redisUtil.set(RedisKeyType.MAIN_PROCESS_PSEUDOCODE.key, result, SUCCESS_CACHE_SECONDS);
+// News.info("AI鐢熸垚浼唬鐮佹垚鍔�");
+// return result;
+// } catch (Exception ignore) {
+// return null;
+// }
+// }
+// String code = loadSourceBundle();
+// if (code == null || code.isEmpty()) {
+// return null;
+// }
+//
+// List<ChatCompletionRequest.Message> messages = new ArrayList<>();
+// ChatCompletionRequest.Message system = new ChatCompletionRequest.Message();
+// system.setRole("system");
+// system.setContent(PSEUDOCODE_SYSTEM_PROMPT);
+// messages.add(system);
+//
+// ChatCompletionRequest.Message user = new ChatCompletionRequest.Message();
+// user.setRole("user");
+// user.setContent("涓绘祦绋嬫彃浠剁被婧愪唬鐮侊細\n\n" + code);
+// messages.add(user);
+//
+// try {
+// String result = trimToNull(llmChatService.chat(messages, 0.2, 2048));
+// if (result == null) {
+// return null;
+// }
+// redisUtil.set(RedisKeyType.MAIN_PROCESS_PSEUDOCODE.key, result, SUCCESS_CACHE_SECONDS);
+// News.info("AI鐢熸垚浼唬鐮佹垚鍔�");
+// return result;
+// } catch (Exception ignore) {
+// return null;
+// }
+// }
- JSONObject result = new JSONObject();
- result.put("mainProcessPlugin", resolvePlugin());
- result.put("mainProcessPluginClass", resolvePluginClassName());
- result.put("refreshRequested", refresh);
- result.put("generatedFresh", generatedFresh);
- result.put("cacheHit", !generatedFresh && ("cached".equals(status) || "fallback_cached".equals(status)));
- result.put("status", status);
- result.put("expireSeconds", redisUtil.getExpire(cacheKey));
- result.put("message", message);
- result.put("pseudocode", pseudocode);
- return result;
- }
+// private String loadSourceBundle() {
+// StringBuilder code = new StringBuilder();
+// appendSource(code, resolvePluginClassName());
+// appendSource(code, "com.zy.core.utils.CrnOperateProcessUtils");
+// appendSource(code, "com.zy.core.utils.StationOperateProcessUtils");
+// return code.toString();
+// }
- private String generateAndCachePseudocode() {
- String code = loadSourceBundle();
- if (code == null || code.isEmpty()) {
- return null;
- }
+// private void appendSource(StringBuilder code, String className) {
+// if (className == null || className.trim().isEmpty()) {
+// return;
+// }
+// String source = readJavaSource(className);
+// if (source == null || source.isEmpty()) {
+// return;
+// }
+// if (code.length() > 0) {
+// code.append("\n\n");
+// }
+// code.append("// ===== ").append(className).append(" =====\n");
+// code.append(source);
+// }
- List<ChatCompletionRequest.Message> messages = new ArrayList<>();
- ChatCompletionRequest.Message system = new ChatCompletionRequest.Message();
- system.setRole("system");
- system.setContent(PSEUDOCODE_SYSTEM_PROMPT);
- messages.add(system);
-
- ChatCompletionRequest.Message user = new ChatCompletionRequest.Message();
- user.setRole("user");
- user.setContent("涓绘祦绋嬫彃浠剁被婧愪唬鐮侊細\n\n" + code);
- messages.add(user);
-
- try {
- String result = trimToNull(llmChatService.chat(messages, 0.2, 2048));
- if (result == null) {
- return null;
- }
- redisUtil.set(RedisKeyType.MAIN_PROCESS_PSEUDOCODE.key, result, SUCCESS_CACHE_SECONDS);
- News.info("AI鐢熸垚浼唬鐮佹垚鍔�");
- return result;
- } catch (Exception ignore) {
- return null;
- }
- }
-
- private String loadSourceBundle() {
- StringBuilder code = new StringBuilder();
- appendSource(code, resolvePluginClassName());
- appendSource(code, "com.zy.core.utils.CrnOperateProcessUtils");
- appendSource(code, "com.zy.core.utils.StationOperateProcessUtils");
- return code.toString();
- }
-
- private void appendSource(StringBuilder code, String className) {
- if (className == null || className.trim().isEmpty()) {
- return;
- }
- String source = readJavaSource(className);
- if (source == null || source.isEmpty()) {
- return;
- }
- if (code.length() > 0) {
- code.append("\n\n");
- }
- code.append("// ===== ").append(className).append(" =====\n");
- code.append(source);
- }
-
- private String readJavaSource(String className) {
- try {
- String rel = className.replace('.', '/') + ".java";
- Path path = Paths.get(System.getProperty("user.dir"), "src", "main", "java", rel);
- if (!Files.exists(path)) {
- return null;
- }
- return Files.readString(path, StandardCharsets.UTF_8);
- } catch (Exception ignore) {
- return null;
- }
- }
+// private String readJavaSource(String className) {
+// try {
+// String rel = className.replace('.', '/') + ".java";
+// Path path = Paths.get(System.getProperty("user.dir"), "src", "main", "java", rel);
+// if (!Files.exists(path)) {
+// return null;
+// }
+// return Files.readString(path, StandardCharsets.UTF_8);
+// } catch (Exception ignore) {
+// return null;
+// }
+// }
private String resolvePlugin() {
String plugin = trimToNull(mainProcessPlugin);
diff --git a/src/main/java/com/zy/ai/timer/MakeMainProcessPseudocodeScheduler.java b/src/main/java/com/zy/ai/timer/MakeMainProcessPseudocodeScheduler.java
index 61cd010..e49921b 100644
--- a/src/main/java/com/zy/ai/timer/MakeMainProcessPseudocodeScheduler.java
+++ b/src/main/java/com/zy/ai/timer/MakeMainProcessPseudocodeScheduler.java
@@ -5,10 +5,9 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-@Component
public class MakeMainProcessPseudocodeScheduler {
- @Autowired
+// @Autowired
private MainProcessPseudocodeService mainProcessPseudocodeService;
@Scheduled(cron = "0/10 * * * * ? ")
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a8cf2d4..562402e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,28 +8,28 @@
- zh-CN
- en-US
# 鍐呯疆璇█鍖呰鍙栦綅缃細classpath:/i18n/<locale>/*.properties
- # 澶栫疆鍙畨瑁呰瑷�鍖呰鐩栫洰褰曪細./stock/out/@pom.build.finalName@/i18n/<locale>/*.properties
- pack-path: ./stock/out/@pom.build.finalName@/i18n
+ # 澶栫疆鍙畨瑁呰瑷�鍖呰鐩栫洰褰曪細./stock/out/wcs/i18n/<locale>/*.properties
+ pack-path: ./stock/out/wcs/i18n
# 澶栫疆璇█鍖呯儹鍔犺浇妫�鏌ュ懆鏈燂紙绉掞級
refresh-seconds: 10
server:
port: 9090
servlet:
- context-path: /@pom.build.finalName@
+ context-path: /wcs
shutdown: graceful
spring:
application:
- name: @pom.build.finalName@
+ name: wcs
datasource:
hikari:
validation-timeout: 3000
connection-test-query: select 1
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/wcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.10.240:3306/nbtlwcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: root
+ password: zy@123
mvc:
static-path-pattern: /**
data:
@@ -82,7 +82,7 @@
logging:
file:
- path: ./stock/out/@pom.build.finalName@/logs
+ path: ./stock/out/wcs/logs
super:
pwd: xltys1995
@@ -92,7 +92,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: crnWcsDev
+ subject: nbtlwcs_dev
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -104,20 +104,20 @@
threadControlCount: 10
liftType: lift
-mainProcessPlugin: FakeProcess
+mainProcessPlugin: NormalProcess
deviceLogStorage:
# 璁惧鏃ュ織瀛樺偍鏂瑰紡 mysql file
type: file
# file绫诲瀷瀛樺偍鍦板潃
- loggingPath: ./stock/out/@pom.build.finalName@/deviceLogs
+ loggingPath: ./stock/out/wcs/deviceLogs
# 鏃ュ織杩囨湡鏃堕棿 鍗曚綅澶�
expireDays: 7
devicePingStorage:
enabled: true
# 绉掔骇璁惧缃戠粶鎺㈡祴鏃ュ織瀛樺偍鍦板潃
- loggingPath: ./stock/out/@pom.build.finalName@/devicePingLogs
+ loggingPath: ./stock/out/wcs/devicePingLogs
# 鏃ュ織杩囨湡鏃堕棿 鍗曚綅澶�
expireDays: 7
# 閲囨牱鍛ㄦ湡锛堟绉掞級
--
Gitblit v1.9.1