From 0a3129cb06fcea6677245097715dcc6fa3de65e5 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 29 十月 2026 14:52:38 +0800
Subject: [PATCH] feat(LIMS): 数据采集清洗验证 + 实时监控预警闭环

---
 src/main/java/com/ruoyi/lims/controller/SampleController.java |  312 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 310 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/lims/controller/SampleController.java b/src/main/java/com/ruoyi/lims/controller/SampleController.java
index b707596..d3db77b 100644
--- a/src/main/java/com/ruoyi/lims/controller/SampleController.java
+++ b/src/main/java/com/ruoyi/lims/controller/SampleController.java
@@ -1,17 +1,27 @@
 package com.ruoyi.lims.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.lims.pojo.Sample;
+import com.ruoyi.lims.pojo.SampleStatusLog;
+import com.ruoyi.lims.pojo.SampleStockRecord;
 import com.ruoyi.lims.service.SampleService;
+import com.ruoyi.lims.service.SampleStatusLogService;
+import com.ruoyi.lims.service.SampleStockRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @AllArgsConstructor
@@ -20,6 +30,13 @@
 public class SampleController {
 
     private SampleService sampleservice;
+    private SampleStockRecordService stockRecordService;
+    private SampleStatusLogService statusLogService;
+
+    private static final String ST_IN_STOCK = "inStock";
+    private static final String ST_OUT_STOCK = "outStock";
+    private static final String ST_TESTING = "testing";
+    private static final String ST_DESTROYED = "destroyed";
 
     @GetMapping("/listPage")
     @ApiOperation("鍒嗛〉鏌ヨ鎵�鏈夋牱鍝佺鐞嗚〃")
@@ -34,16 +51,75 @@
         return AjaxResult.success(sampleservice.getById(id));
     }
 
+    /**
+     * 鏍峰搧璇︽儏锛氭牱鍝佹湰浣� + 鍑哄叆搴撴祦姘� + 鐘舵�佸彉鏇村巻鍙�
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation("鏍峰搧璇︽儏锛堝惈鍑哄叆搴撴祦姘翠笌鐘舵�佸彉鏇村巻鍙诧級")
+    public AjaxResult detail(@PathVariable Long id) {
+        Sample sample = sampleservice.getById(id);
+        if (sample == null) {
+            return AjaxResult.error("鏍峰搧涓嶅瓨鍦�");
+        }
+
+        QueryWrapper<SampleStockRecord> rw = new QueryWrapper<>();
+        rw.eq("sample_id", id).orderByDesc("operate_time").orderByDesc("id");
+        List<SampleStockRecord> records = stockRecordService.list(rw);
+
+        QueryWrapper<SampleStatusLog> sw = new QueryWrapper<>();
+        sw.eq("sample_id", id).orderByDesc("operate_time").orderByDesc("id");
+        List<SampleStatusLog> logs = statusLogService.list(sw);
+
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("sample", sample);
+        result.put("stockRecords", records);
+        result.put("statusLogs", logs);
+        return AjaxResult.success(result);
+    }
+
     @PostMapping("/add")
     @ApiOperation("鏂板鏍峰搧绠$悊琛�")
     public AjaxResult add(@RequestBody Sample sample) {
-        return AjaxResult.success(sampleservice.save(sample));
+        boolean ok = sampleservice.save(sample);
+        // 鏂板缓鏍峰搧榛樿瑙嗕负涓�娆″叆搴擄紝琛ヤ竴鏉℃祦姘达紝鏂逛究杩芥函
+        if (ok && sample.getId() != null) {
+            SampleStockRecord rec = new SampleStockRecord();
+            rec.setSampleId(sample.getId());
+            rec.setSampleCode(sample.getSampleCode());
+            rec.setSampleName(sample.getSampleName());
+            rec.setRecordType("in");
+            rec.setQuantity(sample.getQuantity());
+            rec.setUnit(sample.getUnit());
+            rec.setAfterStatus(sample.getSampleStatus());
+            rec.setToLocation(sample.getStorageLocation());
+            rec.setOperator(currentUser());
+            rec.setOperateTime(LocalDateTime.now());
+            rec.setPurpose("鏍峰搧鐧昏鍏ュ簱");
+            stockRecordService.save(rec);
+        }
+        return AjaxResult.success(ok);
     }
 
     @PostMapping("/update")
     @ApiOperation("淇敼鏍峰搧绠$悊琛�")
     public AjaxResult update(@RequestBody Sample sample) {
-        return AjaxResult.success(sampleservice.updateById(sample));
+        Sample old = sampleservice.getById(sample.getId());
+        boolean ok = sampleservice.updateById(sample);
+
+        // 鐘舵�佽鎵嬪伐鏀瑰姩鏃剁暀鐥�
+        if (ok && old != null && sample.getSampleStatus() != null
+                && !sample.getSampleStatus().equals(old.getSampleStatus())) {
+            SampleStatusLog log = new SampleStatusLog();
+            log.setSampleId(sample.getId());
+            log.setSampleCode(old.getSampleCode());
+            log.setFromStatus(old.getSampleStatus());
+            log.setToStatus(sample.getSampleStatus());
+            log.setChangeReason("琛ㄥ崟淇敼");
+            log.setOperator(currentUser());
+            log.setOperateTime(LocalDateTime.now());
+            statusLogService.save(log);
+        }
+        return AjaxResult.success(ok);
     }
 
     @DeleteMapping("/delete")
@@ -52,4 +128,236 @@
         if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
         return AjaxResult.success(sampleservice.removeBatchByIds(ids));
     }
+
+    /**
+     * 鏍峰搧鍑哄簱锛氭牎楠岀姸鎬佷笌鏁伴噺 -> 鍐欐祦姘� -> 鍐欑姸鎬佸巻鍙� -> 鏇存柊鏍峰搧鐘舵��
+     */
+    @PostMapping("/outStock")
+    @ApiOperation("鏍峰搧鍑哄簱")
+    public AjaxResult outStock(@RequestBody Map<String, Object> body) {
+        Long sampleId = toLong(body.get("sampleId"));
+        if (sampleId == null) {
+            return AjaxResult.error("sampleId 涓嶈兘涓虹┖");
+        }
+        Sample sample = sampleservice.getById(sampleId);
+        if (sample == null) {
+            return AjaxResult.error("鏍峰搧涓嶅瓨鍦�");
+        }
+        if (ST_DESTROYED.equals(sample.getSampleStatus())) {
+            return AjaxResult.error("鏍峰搧宸查攢姣侊紝涓嶈兘鍑哄簱");
+        }
+        if (ST_OUT_STOCK.equals(sample.getSampleStatus())) {
+            return AjaxResult.error("鏍峰搧宸叉槸鍑哄簱鐘舵�侊紝鏃犻渶閲嶅鍑哄簱");
+        }
+
+        BigDecimal qty = toDecimal(body.get("quantity"));
+        if (qty == null || qty.compareTo(BigDecimal.ZERO) <= 0) {
+            return AjaxResult.error("鍑哄簱鏁伴噺蹇呴』澶т簬 0");
+        }
+        BigDecimal stock = sample.getQuantity() == null ? BigDecimal.ZERO : sample.getQuantity();
+        if (qty.compareTo(stock) > 0) {
+            return AjaxResult.error("鍑哄簱鏁伴噺瓒呰繃褰撳墠搴撳瓨锛堢幇鏈� " + stock.stripTrailingZeros().toPlainString()
+                    + (sample.getUnit() == null ? "" : sample.getUnit()) + "锛�");
+        }
+
+        String beforeStatus = sample.getSampleStatus();
+        BigDecimal afterQty = stock.subtract(qty);
+        // 鍏ㄩ儴鍑哄簱鍒欑疆涓哄嚭搴撶姸鎬侊紝閮ㄥ垎鍑哄簱淇濇寔鍘熺姸鎬�
+        String afterStatus = afterQty.compareTo(BigDecimal.ZERO) == 0 ? ST_OUT_STOCK : beforeStatus;
+
+        SampleStockRecord rec = new SampleStockRecord();
+        rec.setSampleId(sample.getId());
+        rec.setSampleCode(sample.getSampleCode());
+        rec.setSampleName(sample.getSampleName());
+        rec.setRecordType("out");
+        rec.setQuantity(qty);
+        rec.setUnit(sample.getUnit());
+        rec.setBeforeStatus(beforeStatus);
+        rec.setAfterStatus(afterStatus);
+        rec.setFromLocation(sample.getStorageLocation());
+        rec.setToLocation(str(body.get("toLocation")));
+        rec.setRecipient(str(body.get("recipient")));
+        rec.setPurpose(str(body.get("purpose")));
+        rec.setRelatedExperiment(str(body.get("relatedExperiment")));
+        rec.setRemark(str(body.get("remark")));
+        rec.setOperator(currentUser());
+        rec.setOperateTime(LocalDateTime.now());
+        stockRecordService.save(rec);
+
+        if (!eq(beforeStatus, afterStatus)) {
+            SampleStatusLog log = new SampleStatusLog();
+            log.setSampleId(sample.getId());
+            log.setSampleCode(sample.getSampleCode());
+            log.setFromStatus(beforeStatus);
+            log.setToStatus(afterStatus);
+            log.setChangeReason("鍑哄簱" + (str(body.get("purpose")) == null ? "" : "锛�" + str(body.get("purpose"))));
+            log.setOperator(currentUser());
+            log.setOperateTime(LocalDateTime.now());
+            statusLogService.save(log);
+        }
+
+        Sample upd = new Sample();
+        upd.setId(sample.getId());
+        upd.setQuantity(afterQty);
+        upd.setSampleStatus(afterStatus);
+        if (str(body.get("toLocation")) != null) {
+            upd.setStorageLocation(str(body.get("toLocation")));
+        }
+        sampleservice.updateById(upd);
+
+        Map<String, Object> ret = new LinkedHashMap<>();
+        ret.put("sampleId", sample.getId());
+        ret.put("beforeQuantity", stock);
+        ret.put("afterQuantity", afterQty);
+        ret.put("beforeStatus", beforeStatus);
+        ret.put("afterStatus", afterStatus);
+        return AjaxResult.success("鍑哄簱鎴愬姛", ret);
+    }
+
+    /**
+     * 鏍峰搧鍏ュ簱锛堣拷鍔犳暟閲忔垨鏂板缓鍚庤ˉ褰曪級
+     */
+    @PostMapping("/inStock")
+    @ApiOperation("鏍峰搧鍏ュ簱")
+    public AjaxResult inStock(@RequestBody Map<String, Object> body) {
+        Long sampleId = toLong(body.get("sampleId"));
+        if (sampleId == null) {
+            return AjaxResult.error("sampleId 涓嶈兘涓虹┖");
+        }
+        Sample sample = sampleservice.getById(sampleId);
+        if (sample == null) {
+            return AjaxResult.error("鏍峰搧涓嶅瓨鍦�");
+        }
+        BigDecimal qty = toDecimal(body.get("quantity"));
+        if (qty == null || qty.compareTo(BigDecimal.ZERO) <= 0) {
+            return AjaxResult.error("鍏ュ簱鏁伴噺蹇呴』澶т簬 0");
+        }
+
+        String beforeStatus = sample.getSampleStatus();
+        BigDecimal stock = sample.getQuantity() == null ? BigDecimal.ZERO : sample.getQuantity();
+        BigDecimal afterQty = stock.add(qty);
+        String afterStatus = ST_OUT_STOCK.equals(beforeStatus) ? ST_IN_STOCK : beforeStatus;
+
+        SampleStockRecord rec = new SampleStockRecord();
+        rec.setSampleId(sample.getId());
+        rec.setSampleCode(sample.getSampleCode());
+        rec.setSampleName(sample.getSampleName());
+        rec.setRecordType("in");
+        rec.setQuantity(qty);
+        rec.setUnit(sample.getUnit());
+        rec.setBeforeStatus(beforeStatus);
+        rec.setAfterStatus(afterStatus);
+        rec.setToLocation(str(body.get("toLocation")) == null ? sample.getStorageLocation() : str(body.get("toLocation")));
+        rec.setRecipient(str(body.get("recipient")));
+        rec.setPurpose(str(body.get("purpose")) == null ? "鏍峰搧鍏ュ簱" : str(body.get("purpose")));
+        rec.setRemark(str(body.get("remark")));
+        rec.setOperator(currentUser());
+        rec.setOperateTime(LocalDateTime.now());
+        stockRecordService.save(rec);
+
+        if (!eq(beforeStatus, afterStatus)) {
+            SampleStatusLog log = new SampleStatusLog();
+            log.setSampleId(sample.getId());
+            log.setSampleCode(sample.getSampleCode());
+            log.setFromStatus(beforeStatus);
+            log.setToStatus(afterStatus);
+            log.setChangeReason("鍏ュ簱");
+            log.setOperator(currentUser());
+            log.setOperateTime(LocalDateTime.now());
+            statusLogService.save(log);
+        }
+
+        Sample upd = new Sample();
+        upd.setId(sample.getId());
+        upd.setQuantity(afterQty);
+        upd.setSampleStatus(afterStatus);
+        if (str(body.get("toLocation")) != null) {
+            upd.setStorageLocation(str(body.get("toLocation")));
+        }
+        sampleservice.updateById(upd);
+
+        Map<String, Object> ret = new LinkedHashMap<>();
+        ret.put("sampleId", sample.getId());
+        ret.put("beforeQuantity", stock);
+        ret.put("afterQuantity", afterQty);
+        ret.put("beforeStatus", beforeStatus);
+        ret.put("afterStatus", afterStatus);
+        return AjaxResult.success("鍏ュ簱鎴愬姛", ret);
+    }
+
+    /**
+     * 鏍峰搧鐘舵�佹祦杞紙鍦ㄥ簱/妫�娴嬩腑/鍑哄簱/閿�姣侊級
+     */
+    @PostMapping("/changeStatus")
+    @ApiOperation("鏍峰搧鐘舵�佹祦杞�")
+    public AjaxResult changeStatus(@RequestBody Map<String, Object> body) {
+        Long sampleId = toLong(body.get("sampleId"));
+        String toStatus = str(body.get("toStatus"));
+        if (sampleId == null || toStatus == null) {
+            return AjaxResult.error("sampleId 鍜� toStatus 涓嶈兘涓虹┖");
+        }
+        Sample sample = sampleservice.getById(sampleId);
+        if (sample == null) {
+            return AjaxResult.error("鏍峰搧涓嶅瓨鍦�");
+        }
+        String fromStatus = sample.getSampleStatus();
+        if (eq(fromStatus, toStatus)) {
+            return AjaxResult.error("鏍峰搧宸插浜庤鐘舵��");
+        }
+
+        SampleStatusLog log = new SampleStatusLog();
+        log.setSampleId(sample.getId());
+        log.setSampleCode(sample.getSampleCode());
+        log.setFromStatus(fromStatus);
+        log.setToStatus(toStatus);
+        log.setChangeReason(str(body.get("changeReason")));
+        log.setOperator(currentUser());
+        log.setOperateTime(LocalDateTime.now());
+        statusLogService.save(log);
+
+        Sample upd = new Sample();
+        upd.setId(sample.getId());
+        upd.setSampleStatus(toStatus);
+        sampleservice.updateById(upd);
+
+        return AjaxResult.success("鐘舵�佸凡鏇存柊");
+    }
+
+    /* ---------------- helpers ---------------- */
+
+    private String currentUser() {
+        try {
+            return SecurityUtils.getUsername();
+        } catch (Exception e) {
+            return "system";
+        }
+    }
+
+    private static String str(Object v) {
+        if (v == null) return null;
+        String s = String.valueOf(v).trim();
+        return s.isEmpty() ? null : s;
+    }
+
+    private static Long toLong(Object v) {
+        if (v == null) return null;
+        try {
+            return Long.valueOf(String.valueOf(v).trim());
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+
+    private static BigDecimal toDecimal(Object v) {
+        if (v == null) return null;
+        try {
+            return new BigDecimal(String.valueOf(v).trim());
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+
+    private static boolean eq(String a, String b) {
+        return a == null ? b == null : a.equals(b);
+    }
 }

--
Gitblit v1.9.3