From 581df60e3254d0e58a47f8266862e74d1c472368 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 15 一月 2026 13:21:11 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   42 +++++++++++++++++++++++++++---------------
 1 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 06626d3..329bc10 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -40,6 +40,10 @@
 
     @Value("${mainProcessPlugin}")
     private String mainProcessPlugin;
+    @Value("${app.version:1.0.0}")
+    private String appVersion;
+    @Value("${app.version-type:stable}")
+    private String appVersionType;
     @Autowired
     private CommonService commonService;
     @Autowired
@@ -51,7 +55,7 @@
     @Autowired
     private DeviceConfigService deviceConfigService;
 
-    //绉诲簱浠诲姟
+    // 绉诲簱浠诲姟
     @PostMapping("/createLocMoveTask")
     @OpenApiLog(memo = "绉诲簱浠诲姟")
     public R createLocMoveTask(@RequestBody CreateLocMoveTaskParam param) {
@@ -65,7 +69,7 @@
         return R.error("鐢熸垚绉诲簱浠诲姟澶辫触");
     }
 
-    //鍏ュ簱浠诲姟
+    // 鍏ュ簱浠诲姟
     @PostMapping("/createInTask")
     @OpenApiLog(memo = "鍏ュ簱浠诲姟")
     public R createInTask(@RequestBody CreateInTaskParam param) {
@@ -79,7 +83,7 @@
         return R.error("鐢熸垚鍏ュ簱浠诲姟澶辫触");
     }
 
-    //鍑哄簱浠诲姟
+    // 鍑哄簱浠诲姟
     @PostMapping("/createOutTask")
     @OpenApiLog(memo = "鍑哄簱浠诲姟")
     public R createOutTask(@RequestBody CreateOutTaskParam param) {
@@ -93,7 +97,7 @@
         return R.error("鐢熸垚鍑哄簱浠诲姟澶辫触");
     }
 
-    //鎵归噺鍑哄簱浠诲姟
+    // 鎵归噺鍑哄簱浠诲姟
     @PostMapping("/createOutTaskBatch")
     @OpenApiLog(memo = "鎵归噺鍑哄簱浠诲姟")
     @Transactional
@@ -143,10 +147,10 @@
     }
 
     @RequestMapping("/deviceStatus")
-//    @OpenApiLog(memo = "鑾峰彇璁惧鐘舵��")
+    // @OpenApiLog(memo = "鑾峰彇璁惧鐘舵��")
     public R getDeviceStatus() {
         HashMap<String, Object> map = new HashMap<>();
-        //鑾峰彇鍫嗗灈鏈烘暟鎹�
+        // 鑾峰彇鍫嗗灈鏈烘暟鎹�
         ArrayList<CrnProtocol> crnProtocols = new ArrayList<>();
         List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
                 .eq("device_type", String.valueOf(SlaveType.Crn)));
@@ -163,7 +167,7 @@
             crnProtocols.add(crnProtocol);
         }
 
-        //鑾峰彇RGV鏁版嵁
+        // 鑾峰彇RGV鏁版嵁
         ArrayList<RgvProtocol> rgvProtocols = new ArrayList<>();
         List<DeviceConfig> rgvList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
                 .eq("device_type", String.valueOf(SlaveType.Rgv)));
@@ -240,13 +244,13 @@
     @OpenApiLog(memo = "鏌ヨ浠诲姟")
     public R queryTask(@RequestBody QueryTaskParam param) {
         EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
-        if(param.getTaskNo() != null) {
+        if (param.getTaskNo() != null) {
             wrapper.eq("wms_wrk_no", param.getTaskNo());
         }
 
-        if(param.getTaskType() != null) {
+        if (param.getTaskType() != null) {
             WrkIoType ioType = WrkIoType.get(param.getTaskType());
-            if(ioType == null) {
+            if (ioType == null) {
                 return R.error("浠诲姟绫诲瀷涓嶅瓨鍦�");
             }
             wrapper.eq("io_type", ioType.id);
@@ -260,15 +264,23 @@
         return R.ok();
     }
 
+    @GetMapping("/getSystemVersion")
+    public R getSystemVersion() {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("version", appVersion);
+        map.put("versionType", appVersionType);
+        return R.ok().add(map);
+    }
+
     @GetMapping("/getFakeSystemRunStatus")
     public R getFakeSystemRunStatus() {
         HashMap<String, Object> map = new HashMap<>();
-        if(mainProcessPlugin.contains("Fake")) {
+        if (mainProcessPlugin.contains("Fake")) {
             map.put("running", false);
             map.put("isFake", true);
             Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "enableFake"));
-            if(config != null) {
-                if(config.getValue().equals("Y")) {
+            if (config != null) {
+                if (config.getValue().equals("Y")) {
                     map.put("running", true);
                 }
             }
@@ -282,7 +294,7 @@
     @OpenApiLog(memo = "鍚姩浠跨湡妯℃嫙")
     public R startFakeSystem() {
         Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "enableFake"));
-        if(config != null) {
+        if (config != null) {
             config.setValue("Y");
             configService.updateById(config);
         }
@@ -293,7 +305,7 @@
     @OpenApiLog(memo = "鍋滄浠跨湡妯℃嫙")
     public R stopFakeSystem() {
         Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "enableFake"));
-        if(config != null) {
+        if (config != null) {
             config.setValue("N");
             configService.updateById(config);
         }

--
Gitblit v1.9.1