From 44daca093696d96e822df6584866910f7316863b Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 10 三月 2025 17:39:54 +0800
Subject: [PATCH] lims检测中心设备代码迁移
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index fbc26ce..1a95be3 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -17,6 +17,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -40,9 +41,12 @@
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@ApiOperation(value = "鏌ョ湅鎵�灞炲崟浣嶆楠屽崟")
@GetMapping("/selectInsOrderParameter")
+ @PreAuthorize("@ss.hasPermi('business:order:queryAll')")
public Result selectInsOrderParameter(Page page, SampleOrderDto sampleOrderDto) {
return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
}
+
+
//鐢ㄤ簬妫�楠屼笅鍗曞尯鍒煡鐪嬫墍鏈夎鍗曞拰鍙煡鐪嬪悓涓�涓鎵樺崟浣嶇殑璁㈠崟
@ApiOperation(value = "鍒ゆ柇褰撳墠瀹㈡埛绱ф�ラ搴︽槸鍚︾敤瀹�")
@@ -52,11 +56,11 @@
}
//鐢ㄤ簬妫�楠屼笅鍗曞尯鍒煡鐪嬫墍鏈夎鍗曞拰鍙煡鐪嬪悓涓�涓鎵樺崟浣嶇殑璁㈠崟
- @ApiOperation(value = "鏌ョ湅鎵�鏈夋楠屽崟")
- @PostMapping("/selectAllInsOrderParameter")
- public Result selectAllInsOrderParameter() {
- return Result.success();
- }
+// @ApiOperation(value = "鏌ョ湅鎵�鏈夋楠屽崟")
+// @PostMapping("/selectAllInsOrderParameter")
+// public Result selectAllInsOrderParameter() {
+// return Result.success();
+// }
@ApiOperation(value = "鍒嗛厤鎸夐挳")
@@ -78,14 +82,14 @@
}
@ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
- @PostMapping("/selectOrderManDay")
+ @GetMapping("/selectOrderManDay")
public Result<?> selectOrderManDay(Integer id) {
int day = insProductService.selectOrderManDay(id);
return Result.success("鎴愬姛", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
}
@ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
- @PostMapping("/getInsOrder")
+ @GetMapping("/getInsOrder")
public Result<?> getInsOrder(Integer orderId) {
return Result.success(insOrderService.getInsOrder(orderId));
}
@@ -119,13 +123,13 @@
}
@ApiOperation(value = "閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭")
- @PostMapping("/selectInsOrderTemplateById")
+ @GetMapping("/selectInsOrderTemplateById")
public Result<?> selectInsOrderTemplateById(Integer id) {
return Result.success( insOrderTemplateService.selectInsOrderTemplateById(id),"鎴愬姛");
}
@ApiOperation(value = "閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�")
- @PostMapping("/selectSampleAndProductByOrderId")
+ @GetMapping("/selectSampleAndProductByOrderId")
public Result<?> selectSampleAndProductByOrderId(@RequestBody Map<String, Object> data) throws Exception {
SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
return Result.success(insOrderService.selectSampleAndProductByOrderId(sampleProductDto));
@@ -143,7 +147,7 @@
}
@ApiOperation(value = "璐圭敤缁熻鑾峰彇鎬讳环")
- @PostMapping("/costStatistics2")
+ @GetMapping("/costStatistics2")
public Result<?> costStatistics2(@RequestBody Map<String, Object> data) throws Exception {
CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
return Result.success(insOrderService.costStatistics2(costStatisticsDto));
@@ -157,7 +161,7 @@
}
//寰呮鐨勬挙閿�鐨勬煡璇㈠緟妫�椤圭洰
- @PostMapping("/selectNoProducts")
+ @GetMapping("/selectNoProducts")
public Result<?> selectNoProducts(@RequestBody Map<String, Object> data,Integer orderId ,String ids) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
InsProduct insProduct = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsProduct.class);
@@ -289,13 +293,13 @@
}
@ApiOperation(value = "鏍囩鎵撳嵃鎸夐挳")
- @PostMapping("/labelPrinting")
+ @GetMapping("/labelPrinting")
public Result<?> labelPrinting(String ids) {
return Result.success(insOrderService.labelPrinting(ids));
}
@ApiOperation(value = "鏌ョ湅璐圭敤缁熻鍒楄〃")
- @PostMapping("/costStatistics")
+ @GetMapping("/costStatistics")
public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
@@ -303,7 +307,7 @@
}
@ApiOperation(value = "鏌ョ湅缁撴灉鎸夐挳(娓╁害寰幆)")
- @PostMapping("/getInsOrderTemList")
+ @GetMapping("/getInsOrderTemList")
public Result getInsOrderTemList(@RequestBody Map<String, Object> data) {
return Result.success(insOrderService.getInsOrderTemList(data));
}
--
Gitblit v1.9.3