From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/limsController/LimsSxtQingyanXiangmuController.java | 68 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/limsController/LimsSxtQingyanXiangmuController.java b/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/limsController/LimsSxtQingyanXiangmuController.java
new file mode 100644
index 0000000..80b90cd
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/limsController/LimsSxtQingyanXiangmuController.java
@@ -0,0 +1,68 @@
+package jnpf.limsController;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jnpf.limsEntity.LimsSxtQingyanXiangmuParam;
+import jnpf.limsEntity.ZhiliangBiaozhunGuanliZixiangEntity;
+import jnpf.limsModel.LimsSxtQuyangdianVO;
+import jnpf.limsService.LimsSxtJihuaService;
+import jnpf.limsService.LimsSxtQingyanXiangmuService;
+import jnpf.limsService.LimsSxtQuyangJihuaRenwuService;
+import jnpf.util.R;
+import jnpf.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Slf4j
+@Tag(name = "lims姘寸郴缁熻楠岄」鐩�", description = "")
+@RestController
+@RequestMapping("/lims/biz/sxt")
+public class LimsSxtQingyanXiangmuController {
+
+ @Autowired
+ private LimsSxtQingyanXiangmuService qingyanXiangmuService;
+ @Autowired
+ private LimsSxtJihuaService jihuaService;
+ @Autowired
+ private LimsSxtQuyangJihuaRenwuService renwuService;
+
+ @GetMapping("/jianyan/xiangmu")
+ public R<List<ZhiliangBiaozhunGuanliZixiangEntity>> getJianyanXiangmu(LimsSxtQingyanXiangmuParam param) {
+ return qingyanXiangmuService.getJianyanXiangmuList(param);
+ }
+
+ @GetMapping("/jihua/quyangdian")
+ public R<List<LimsSxtQuyangdianVO>> getJihuaQuyangdian(@RequestParam String leixing,
+ @RequestParam String chejian) {
+ return qingyanXiangmuService.getJihuaQuyangdian(leixing, chejian);
+ }
+
+ @Operation(summary = "鎵嬪姩瑙﹀彂褰撳ぉ璁″垝")
+ @PostMapping("/jihua/run-now")
+ public R<Object> jihuaRunNow(@RequestParam(value = "date") String date, @RequestParam(value = "dry", defaultValue = "false") boolean dry) {
+ LocalDate localDate = LocalDate.now();
+ if (StringUtil.isNotEmpty(date)) {
+ localDate = LocalDate.parse(date);
+ }
+ jihuaService.runDailyJihua(localDate, dry);
+ return R.success();
+ }
+
+ @Operation(summary = "鎵嬪姩瑙﹀彂鍒跺畾璁″垝锛屾瘮濡傚鎵圭粨閫熷彲鐢�")
+ @PostMapping("/jihua/run")
+ public R<Object> jihuaRunById(@RequestParam(value = "id") String id) {
+ jihuaService.runJihua(id);
+ return R.success();
+ }
+
+ @Operation(summary = "琛ュ伩宸插鎵瑰彇鏍疯鍒掔殑Renwu蹇収")
+ @PostMapping("/jihua/renwu/buchang")
+ public R<Integer> buchangYishenpiJihuaRenwu() {
+ return R.success(renwuService.buchangYishenpiJihuaRenwu());
+ }
+
+}
--
Gitblit v1.8.0