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/ExperimentController.java | 346 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 345 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/lims/controller/ExperimentController.java b/src/main/java/com/ruoyi/lims/controller/ExperimentController.java
index f85584d..6c42006 100644
--- a/src/main/java/com/ruoyi/lims/controller/ExperimentController.java
+++ b/src/main/java/com/ruoyi/lims/controller/ExperimentController.java
@@ -1,17 +1,32 @@
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.Experiment;
+import com.ruoyi.lims.pojo.ExperimentResource;
+import com.ruoyi.lims.pojo.ExperimentStep;
+import com.ruoyi.lims.pojo.Reagent;
+import com.ruoyi.lims.pojo.ReagentRecord;
+import com.ruoyi.lims.service.ExperimentResourceService;
import com.ruoyi.lims.service.ExperimentService;
+import com.ruoyi.lims.service.ExperimentStepService;
+import com.ruoyi.lims.service.ReagentRecordService;
+import com.ruoyi.lims.service.ReagentService;
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.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
@RestController
@AllArgsConstructor
@@ -20,6 +35,10 @@
public class ExperimentController {
private ExperimentService experimentservice;
+ private ExperimentStepService stepService;
+ private ExperimentResourceService resourceService;
+ private ReagentService reagentService;
+ private ReagentRecordService reagentRecordService;
@GetMapping("/listPage")
@ApiOperation("鍒嗛〉鏌ヨ鎵�鏈夊疄楠岀鐞嗚〃")
@@ -32,6 +51,39 @@
@ApiOperation("鏍规嵁ID鏌ヨ瀹為獙绠$悊琛�")
public AjaxResult getExperiment(@PathVariable Long id) {
return AjaxResult.success(experimentservice.getById(id));
+ }
+
+ /**
+ * 瀹為獙璇︽儏锛氬疄楠屾湰浣� + 娴佺▼鑺傜偣 + 宸插垎閰嶈祫婧� + 鎵ц杩涘害
+ */
+ @GetMapping("/detail/{id}")
+ @ApiOperation("瀹為獙璇︽儏锛堝惈娴佺▼鑺傜偣涓庤祫婧愬垎閰嶏級")
+ public AjaxResult detail(@PathVariable Long id) {
+ Experiment exp = experimentservice.getById(id);
+ if (exp == null) {
+ return AjaxResult.error("瀹為獙涓嶅瓨鍦�");
+ }
+
+ QueryWrapper<ExperimentStep> sw = new QueryWrapper<>();
+ sw.eq("experiment_id", id).orderByAsc("step_no").orderByAsc("id");
+ List<ExperimentStep> steps = stepService.list(sw);
+
+ QueryWrapper<ExperimentResource> rw = new QueryWrapper<>();
+ rw.eq("experiment_id", id).orderByAsc("id");
+ List<ExperimentResource> resources = resourceService.list(rw);
+
+ int total = steps.size();
+ long done = steps.stream().filter(s -> "completed".equals(s.getStepStatus())).count();
+ int progress = total == 0 ? 0 : (int) Math.round(done * 100.0 / total);
+
+ Map<String, Object> result = new LinkedHashMap<>();
+ result.put("experiment", exp);
+ result.put("steps", steps);
+ result.put("resources", resources);
+ result.put("stepTotal", total);
+ result.put("stepCompleted", done);
+ result.put("progress", progress);
+ return AjaxResult.success(result);
}
@PostMapping("/add")
@@ -50,6 +102,298 @@
@ApiOperation("鍒犻櫎瀹為獙绠$悊琛�")
public AjaxResult delete(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(experimentservice.removeBatchByIds(ids));
+ boolean ok = experimentservice.removeBatchByIds(ids);
+ if (ok && !CollectionUtils.isEmpty(ids)) {
+ // 杩炲甫娓呮帀姝ラ涓庤祫婧愶紝閬垮厤瀛ゅ効鏁版嵁
+ QueryWrapper<ExperimentStep> sw = new QueryWrapper<>();
+ sw.in("experiment_id", ids);
+ stepService.remove(sw);
+ QueryWrapper<ExperimentResource> rw = new QueryWrapper<>();
+ rw.in("experiment_id", ids);
+ resourceService.remove(rw);
+ }
+ return AjaxResult.success(ok);
+ }
+
+ /* ==================== 娴佺▼鑺傜偣锛圫OP 姝ラ锛� ==================== */
+
+ /**
+ * 鎵归噺淇濆瓨姝ラ锛氫紶鍏ㄩ噺鍒楄〃锛屽厛鍒犲悗鎻掞紝淇濊瘉椤哄簭鍜屽唴瀹逛竴鑷�
+ */
+ @PostMapping("/step/saveBatch")
+ @ApiOperation("鎵归噺淇濆瓨瀹為獙娴佺▼鑺傜偣")
+ public AjaxResult saveSteps(@RequestBody Map<String, Object> body) {
+ Long experimentId = toLong(body.get("experimentId"));
+ if (experimentId == null) {
+ return AjaxResult.error("experimentId 涓嶈兘涓虹┖");
+ }
+ Experiment exp = experimentservice.getById(experimentId);
+ if (exp == null) {
+ return AjaxResult.error("瀹為獙涓嶅瓨鍦�");
+ }
+ Object rawList = body.get("steps");
+ if (!(rawList instanceof List)) {
+ return AjaxResult.error("steps 蹇呴』鏄暟缁�");
+ }
+
+ QueryWrapper<ExperimentStep> dw = new QueryWrapper<>();
+ dw.eq("experiment_id", experimentId);
+ stepService.remove(dw);
+
+ List<?> list = (List<?>) rawList;
+ int idx = 0;
+ for (Object o : list) {
+ if (!(o instanceof Map)) continue;
+ Map<?, ?> m = (Map<?, ?>) o;
+ ExperimentStep step = new ExperimentStep();
+ step.setExperimentId(experimentId);
+ step.setExperimentCode(exp.getExperimentCode());
+ step.setStepNo(toInt(m.get("stepNo")) == null ? (idx + 1) : toInt(m.get("stepNo")));
+ step.setStepName(str(m.get("stepName")));
+ step.setStepContent(str(m.get("stepContent")));
+ step.setExpectedDuration(toInt(m.get("expectedDuration")));
+ step.setExecutor(str(m.get("executor")));
+ step.setStepStatus(str(m.get("stepStatus")) == null ? "pending" : str(m.get("stepStatus")));
+ step.setRemark(str(m.get("remark")));
+ stepService.save(step);
+ idx++;
+ }
+
+ return AjaxResult.success("宸蹭繚瀛� " + idx + " 涓楠�");
+ }
+
+ /**
+ * 瀹屾垚/鎺ㄨ繘鍗曚釜姝ラ
+ */
+ @PostMapping("/step/complete")
+ @ApiOperation("瀹屾垚瀹為獙姝ラ")
+ public AjaxResult completeStep(@RequestBody Map<String, Object> body) {
+ Long stepId = toLong(body.get("stepId"));
+ if (stepId == null) {
+ return AjaxResult.error("stepId 涓嶈兘涓虹┖");
+ }
+ ExperimentStep step = stepService.getById(stepId);
+ if (step == null) {
+ return AjaxResult.error("姝ラ涓嶅瓨鍦�");
+ }
+ if ("completed".equals(step.getStepStatus())) {
+ return AjaxResult.error("璇ユ楠ゅ凡瀹屾垚");
+ }
+
+ String operator = currentUser();
+ LocalDateTime now = LocalDateTime.now();
+
+ ExperimentStep upd = new ExperimentStep();
+ upd.setId(stepId);
+ upd.setStepStatus(str(body.get("stepStatus")) == null ? "completed" : str(body.get("stepStatus")));
+ upd.setStepResult(str(body.get("stepResult")));
+ upd.setExecutor(str(body.get("executor")) == null ? operator : str(body.get("executor")));
+ if (step.getActualStartTime() == null) {
+ upd.setActualStartTime(now);
+ }
+ upd.setActualEndTime(now);
+ stepService.updateById(upd);
+
+ // 鍏ㄩ儴姝ラ瀹屾垚 -> 瀹為獙鐘舵�佺疆涓哄凡瀹屾垚
+ Long expId = step.getExperimentId();
+ if (expId != null) {
+ QueryWrapper<ExperimentStep> cw = new QueryWrapper<>();
+ cw.eq("experiment_id", expId).ne("step_status", "completed");
+ long remain = stepService.count(cw);
+ if (remain == 0) {
+ Experiment eu = new Experiment();
+ eu.setId(expId);
+ eu.setExperimentStatus("completed");
+ experimentservice.updateById(eu);
+ } else {
+ Experiment eu = new Experiment();
+ eu.setId(expId);
+ eu.setExperimentStatus("inProgress");
+ experimentservice.updateById(eu);
+ }
+ }
+
+ return AjaxResult.success("姝ラ宸插畬鎴�");
+ }
+
+ /* ==================== 璧勬簮鍒嗛厤 ==================== */
+
+ /**
+ * 鍒嗛厤璧勬簮锛氫华鍣�/浜哄憳鍙褰曪紱璇曞墏浼氬疄闄呮墸鍑忓簱瀛樺苟鍐欏嚭鍏ュ簱娴佹按
+ */
+ @PostMapping("/assignResource")
+ @ApiOperation("涓哄疄楠屽垎閰嶈祫婧�")
+ public AjaxResult assignResource(@RequestBody Map<String, Object> body) {
+ Long experimentId = toLong(body.get("experimentId"));
+ if (experimentId == null) {
+ return AjaxResult.error("experimentId 涓嶈兘涓虹┖");
+ }
+ Experiment exp = experimentservice.getById(experimentId);
+ if (exp == null) {
+ return AjaxResult.error("瀹為獙涓嶅瓨鍦�");
+ }
+ String resourceType = str(body.get("resourceType"));
+ if (resourceType == null) {
+ return AjaxResult.error("resourceType 涓嶈兘涓虹┖");
+ }
+
+ ExperimentResource res = new ExperimentResource();
+ res.setExperimentId(experimentId);
+ res.setExperimentCode(exp.getExperimentCode());
+ res.setResourceType(resourceType);
+ res.setResourceId(toLong(body.get("resourceId")));
+ res.setResourceCode(str(body.get("resourceCode")));
+ res.setResourceName(str(body.get("resourceName")));
+ res.setQuantity(toDecimal(body.get("quantity")));
+ res.setUnit(str(body.get("unit")));
+ res.setUsageTime(str(body.get("usageTime")));
+ res.setStatus(str(body.get("status")) == null ? "planned" : str(body.get("status")));
+ res.setRemark(str(body.get("remark")));
+
+ // 璇曞墏/鑰楁潗锛氱湡瀹炴墸搴撳瓨 + 鍐欐祦姘�
+ if ("reagent".equals(resourceType) && res.getResourceId() != null) {
+ Reagent re = reagentService.getById(res.getResourceId());
+ if (re == null) {
+ return AjaxResult.error("璇曞墏/鑰楁潗涓嶅瓨鍦�");
+ }
+ BigDecimal useQty = res.getQuantity() == null ? BigDecimal.ZERO : res.getQuantity();
+ BigDecimal stock = re.getCurrentStock() == null ? BigDecimal.ZERO : re.getCurrentStock();
+ if (useQty.compareTo(BigDecimal.ZERO) > 0 && useQty.compareTo(stock) > 0) {
+ return AjaxResult.error("璇曞墏搴撳瓨涓嶈冻锛堢幇鏈� " + stock.stripTrailingZeros().toPlainString()
+ + (re.getUnit() == null ? "" : re.getUnit()) + "锛�");
+ }
+ res.setResourceCode(re.getReagentCode());
+ res.setResourceName(re.getReagentName());
+ if (res.getUnit() == null) res.setUnit(re.getUnit());
+
+ if (useQty.compareTo(BigDecimal.ZERO) > 0) {
+ BigDecimal after = stock.subtract(useQty);
+ ReagentRecord rec = new ReagentRecord();
+ rec.setReagentId(re.getId());
+ rec.setReagentCode(re.getReagentCode());
+ rec.setReagentName(re.getReagentName());
+ rec.setRecordType("out");
+ rec.setQuantity(useQty);
+ rec.setBeforeStock(stock);
+ rec.setAfterStock(after);
+ rec.setOperator(currentUser());
+ rec.setOperateTime(LocalDateTime.now());
+ rec.setPurpose("瀹為獙棰嗙敤");
+ rec.setRelatedExperiment(exp.getExperimentCode());
+ reagentRecordService.save(rec);
+
+ Reagent ru = new Reagent();
+ ru.setId(re.getId());
+ ru.setCurrentStock(after);
+ reagentService.updateById(ru);
+ }
+ }
+
+ resourceService.save(res);
+ return AjaxResult.success("璧勬簮宸插垎閰�");
+ }
+
+ @DeleteMapping("/resource/{id}")
+ @ApiOperation("绉婚櫎瀹為獙璧勬簮鍒嗛厤")
+ public AjaxResult removeResource(@PathVariable Long id) {
+ return AjaxResult.success(resourceService.removeById(id));
+ }
+
+ /* ==================== 娴佺▼妯℃澘 ==================== */
+
+ /**
+ * 甯哥敤瀹為獙绫诲瀷鐨� SOP 妯℃澘锛屽墠绔�屽鐢ㄦā鏉裤�嶆椂鎸夌被鍨嬫媺鍙�
+ */
+ @GetMapping("/stepTemplate")
+ @ApiOperation("鑾峰彇娴佺▼妯℃澘")
+ public AjaxResult stepTemplate(@RequestParam(required = false) String type) {
+ Map<String, List<Map<String, Object>>> templates = new LinkedHashMap<>();
+
+ templates.put("chemicalAnalysis", buildSteps(
+ new String[][]{
+ {"鏍峰搧鍓嶅鐞�", "鎸夋爣鍑嗙О鍙栨牱鍝侊紝瀹氬鑷冲埢搴︼紝鎽囧寑闈欑疆 10 鍒嗛挓"},
+ {"璇曞墏閰嶅埗", "鎸夋柟娉曡姹傞厤鍒舵爣鍑嗘憾娑蹭笌鏄捐壊鍓傦紝鐜伴厤鐜扮敤"},
+ {"浠櫒棰勭儹", "寮�鍚垎鏋愪华鍣ㄩ鐑� 30 鍒嗛挓锛屽緟鍩虹嚎绋冲畾"},
+ {"鏍囧噯鏇茬嚎缁樺埗", "渚濇娴嬪畾鏍囧噯绯诲垪锛岀粯鍒舵洸绾匡紝鐩稿叧绯绘暟搴� 鈮�0.999"},
+ {"鏍峰搧娴嬪畾", "鎸夐『搴忔祴瀹氭牱鍝侊紝姣� 10 涓牱鍝佹彃鍏ヤ竴娆¤川鎺ф牱"},
+ {"鏁版嵁澶勭悊", "璁$畻娴撳害缁撴灉锛屽仛骞宠鏍峰亸宸鏌�"}
+ }));
+ templates.put("physicalTest", buildSteps(
+ new String[][]{
+ {"璇曟牱鍒跺", "鎸夋爣鍑嗚鍒�/鍔犲伐璇曟牱锛岃褰曞昂瀵镐笌澶栬"},
+ {"璁惧璋冭瘯", "鏍″噯璇曢獙鏈洪浂鐐癸紝璁剧疆璇曢獙閫熷害"},
+ {"瑁呭す瀹氫綅", "灏嗚瘯鏍疯澶逛簬澶瑰叿涓績锛岀‘淇濆彈鍔涜酱绾夸竴鑷�"},
+ {"鍔犺浇璇曢獙", "鎸夎瀹氶�熷害鍔犺浇鐩磋嚦鐮村潖锛岃褰曟渶澶у姏鍊�"},
+ {"缁撴灉璁$畻", "璁$畻寮哄害/浼搁暱鐜囷紝鍙� 3 涓湁鏁堣瘯鏍风殑骞冲潎鍊�"}
+ }));
+ templates.put("microbialTest", buildSteps(
+ new String[][]{
+ {"鍩瑰吇鍩洪厤鍒�", "鎸夐厤鏂归厤鍒跺煿鍏诲熀锛�121鈩� 鐏弻 15 鍒嗛挓"},
+ {"鏍峰搧绋�閲�", "鏃犺弻鎿嶄綔姊害绋�閲婃牱鍝侊紝鍒跺 10^-1 ~ 10^-3 绋�閲婃恫"},
+ {"鎺ョ", "鍙� 1mL 绋�閲婃恫娉ㄥ叆骞崇毧锛屽�炬敞鍩瑰吇鍩烘贩鍖�"},
+ {"鍩瑰吇", "36卤1鈩� 鍩瑰吇 48卤2 灏忔椂"},
+ {"鑿岃惤璁℃暟", "閫夊彇 30~300 涓弻钀界殑骞崇毧璁℃暟锛屾崲绠� CFU/mL"}
+ }));
+
+ if (type != null && templates.containsKey(type)) {
+ return AjaxResult.success(templates.get(type));
+ }
+ return AjaxResult.success(templates);
+ }
+
+ private List<Map<String, Object>> buildSteps(String[][] arr) {
+ List<Map<String, Object>> list = new ArrayList<>();
+ for (int i = 0; i < arr.length; i++) {
+ Map<String, Object> m = new LinkedHashMap<>();
+ m.put("stepNo", i + 1);
+ m.put("stepName", arr[i][0]);
+ m.put("stepContent", arr[i][1]);
+ m.put("stepStatus", "pending");
+ list.add(m);
+ }
+ return list;
+ }
+
+ /* ---------------- 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 Integer toInt(Object v) {
+ if (v == null) return null;
+ try {
+ return Integer.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;
+ }
}
}
--
Gitblit v1.9.3