优化

wms-webapi/src/main/java/top/wms/admin/controller/fullWorkOrder/FullWorkOrderController.java

@@ -8,12 +8,17 @@ import org.springframework.web.bind.annotation.*;
 
 import lombok.RequiredArgsConstructor;
 import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
+import top.continew.starter.log.annotation.Log;
+import top.continew.starter.web.model.R;
 import top.wms.admin.common.controller.BaseController;
 import top.wms.admin.fullWorkOrder.model.query.FullWorkOrderQuery;
+import top.wms.admin.fullWorkOrder.model.req.FullWorkOrderInfoReq;
 import top.wms.admin.fullWorkOrder.model.req.FullWorkOrderReq;
 import top.wms.admin.fullWorkOrder.model.resp.FullWorkOrderResp;
 import top.wms.admin.fullWorkOrder.service.FullWorkOrderService;
 
+import java.util.List;
+
 /**
  * 整箱领取记录管理 API
  *
@@ -26,4 +31,16 @@ import top.wms.admin.fullWorkOrder.service.FullWorkOrderService;
 @CrudRequestMapping(value = "/fullWorkOrder/fullWorkOrder", api = {Api.PAGE, Api.ADD, Api.DELETE, Api.EXPORT})
 public class FullWorkOrderController extends BaseController<FullWorkOrderService, FullWorkOrderResp, FullWorkOrderResp, FullWorkOrderQuery, FullWorkOrderReq> {
 
+
+    @PostMapping("/saveInfo")
+    public R saveFullWorkOrderDetail(@RequestBody List<FullWorkOrderInfoReq> infos) {
+        baseService.saveFullWorkOrderDetail(infos);
+        return R.ok();
+    }
+
+    @Log(ignore = true)
+    @GetMapping("/infos/{fullWorkOrderId}")
+    public R getFullWorkOrderInfos(@PathVariable Long fullWorkOrderId) {
+        return R.ok(baseService.getFullWorkOrderInfos(fullWorkOrderId));
+    }
 }

wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java

@@ -10,8 +10,10 @@ import org.springframework.web.bind.annotation.RestController;
 import top.continew.starter.web.model.R;
 
 import java.nio.charset.Charset;
+import java.util.Random;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -51,6 +53,11 @@ public class AHDZCConnect {
 
     private ScheduledExecutorService executorService;
 
+    // todo 模拟数据生成
+//    private ScheduledFuture<?> mockDataTask;
+//    private final AtomicBoolean isMockDataRunning = new AtomicBoolean(false);
+//    private final Random random = new Random();
+
     /**
      * 初始化并启动电子秤服务
      */
@@ -66,6 +73,11 @@ public class AHDZCConnect {
         // 重新初始化并启动服务
         ScaleService();
         start();
+
+// todo 模拟数据生成
+//        isMockDataRunning.set(true);
+//        startMockData();
+
         return R.ok();
     }
 
@@ -325,6 +337,9 @@ public class AHDZCConnect {
         log.info("停止电子秤线程...");
         log.info("========================================");
 
+// todo 模拟数据生成
+//        stopMockData();
+
         try {
             if (executorService != null && !executorService.isShutdown()) {
                 executorService.shutdown();
@@ -344,4 +359,33 @@ public class AHDZCConnect {
         log.info("线程已完全停止");
     }
 
+    // todo 模拟数据生成
+//    private void startMockData() {
+//        if (executorService == null || executorService.isShutdown()) {
+//            log.warn("[模拟数据] 线程池未初始化或已关闭");
+//            return;
+//        }
+//
+//        mockDataTask = executorService.scheduleAtFixedRate(() -> {
+//            if (!isMockDataRunning.get()) {
+//                return;
+//            }
+//
+//            try {
+//                ScaleWebSocketHandler.sendMessage(String.valueOf(random.nextInt(100) + 1));
+//                log.debug("[模拟数据] 发送重量数据: 37.8");
+//            } catch (Exception e) {
+//                log.error("[模拟数据] 发送异常: {}", e.getMessage());
+//            }
+//        }, 0, 1, TimeUnit.SECONDS);
+//    }
+//
+//    private void stopMockData() {
+//        if (mockDataTask != null && !mockDataTask.isCancelled()) {
+//            mockDataTask.cancel(false);
+//            mockDataTask = null;
+//        }
+//        isMockDataRunning.set(false);
+//    }
+
 }

wms-webapi/src/main/java/top/wms/admin/controller/ys/ysNetController.java

@@ -1,8 +1,9 @@
 package top.wms.admin.controller.ys;
 
-import com.alibaba.fastjson2.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import top.continew.starter.log.annotation.Log;
 import top.continew.starter.web.model.R;
 import top.wms.admin.controller.ys.req.CaptureReq;