From a24095d096e7ab1f83e44aa8054d0f673db05b38 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 07 三月 2025 09:09:40 +0800
Subject: [PATCH] Merge branch 'dev_dz' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 71 +++++------------------------------
1 files changed, 11 insertions(+), 60 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 e65b4ea..21a7226 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
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.controller;
+package com.ruoyi.inspect.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -27,6 +27,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletException;
@@ -75,23 +76,18 @@
return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId,sonLaboratory));
}
- //todo: 涓嬪崟闇�瑕佷慨鏀�
@ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
+ @PreAuthorize("@ss.hasPermi('add:insOrder')")
@PostMapping("/addInsOrder")
- public Result<?> addInsOrder(String str) {
- Map<String, Object> map = JSON.parseObject(str, Map.class);
- JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
- List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
- InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
- List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
- return Result.success(insOrderService.addInsOrder(list, insOrder, pairing));
+ public Result<?> addInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
+ return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
}
@ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@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")));
+ return Result.success(LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
}
@ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
@@ -105,7 +101,6 @@
@ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "state", value = "瀹℃牳缁撴灉 1:閫氳繃 2锛氫笉閫氳繃", dataTypeClass = Integer.class)
})
-
@PostMapping("/upInsOrderOfState")
public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
return Result.success(insOrderService.upInsOrderOfState(insOrder));
@@ -126,7 +121,7 @@
@ApiOperation(value = "閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭")
@GetMapping("/selectInsOrderTemplateById")
public Result<?> selectInsOrderTemplateById(Integer id) {
- return Result.success("鎴愬姛", insOrderTemplateService.selectInsOrderTemplateById(id));
+ return Result.success(insOrderTemplateService.selectInsOrderTemplateById(id));
}
@ApiOperation(value = "鍒犻櫎妫�楠屽崟妯℃澘")
@@ -139,25 +134,6 @@
@GetMapping("/selectSampleAndProductByOrderId")
public Result<?> selectSampleAndProductByOrderId(Page page, SampleProductDto2 sampleProductDto){
return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
- }
-
- @ApiOperation(value = "璐圭敤缁熻")
- @GetMapping("/costStatistics")
- public Result<?> costStatistics(Page page, CostStatisticsDto costStatisticsDto){
- return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
- }
-
- @ApiOperation(value = "璐圭敤缁熻鑾峰彇鎬讳环")
- @GetMapping("/costStatistics2")
- public Result<?> costStatistics2(CostStatisticsDto costStatisticsDto){
- return Result.success(insOrderService.costStatistics2(costStatisticsDto));
- }
-
-
- @ApiOperation(value = "鏍峰搧缂洪櫡鎸囨暟")
- @GetMapping("/selectSampleDefects")
- public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
- return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));
}
@@ -203,23 +179,11 @@
}
- @ApiOperation(value = "璐圭敤缁熻瀵煎嚭")
- @GetMapping("/export")
- public void export(CostStatisticsDto costStatisticsDto,HttpServletResponse response) throws ServletException, IOException {
- insOrderService.export(costStatisticsDto,response);
- }
-
-
@ApiOperation(value = "鑾峰彇ifs璁㈠崟")
@GetMapping("/getIfsOrder")
public Result<?> getIfsOrder() {
insOrderService.getIfsOrder();
return Result.success();
- }
-
- @Scheduled(fixedDelay = 1200000)
- public void getIfsOrderTiming() {
- insOrderService.getIfsOrder();
}
@@ -236,19 +200,6 @@
return Result.success(insOrderService.getRetestResult(insProductId));
}
-
-
- @ApiOperation(value = "閾滃崟涓濅笅鍗�")
- @PostMapping("/addRawCopperOrder")
- public Result<?> addRawCopperOrder(String str) {
- Map<String, Object> map = JSON.parseObject(str, Map.class);
- JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
- List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
- CopperInsOrderDto CopperInsOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), CopperInsOrderDto.class);
- return Result.success(insOrderService.addRawCopperOrder(list, CopperInsOrder));
- }
-
-
@ApiOperation(value = "淇敼濮旀墭缂栧彿")
@PostMapping("/updateOrderEntrustCode")
public Result<?> updateOrderEntrustCode(@RequestBody InsOrder insOrder) {
@@ -263,11 +214,11 @@
}
@ApiOperation(value = "鍒犻櫎閫�鍥炶鍗�")
- @GetMapping("/delInsOrder")
+ @DeleteMapping("/delInsOrder")
public Result<?> delInsOrder(Integer insOrderId) {
// 鏌ヨ璁㈠崟
InsOrder order = insOrderService.getById(insOrderId);
- if (!order.getState().equals(2)) {
+ if (!(order.getState().equals(2) || order.getState().equals(3))) {
throw new ErrorException("鍙湁閫�鍥炶鍗曟墠鑳藉垹闄�");
}
@@ -302,8 +253,8 @@
}
@ApiOperation(value = "鎴愬搧妫�楠屽崟鍏ㄩ儴淇℃伅瀵煎嚭")
- @PostMapping("/rawAllInsOrderExport")
- public void rawAllInsOrderExport(@RequestBody SampleOrderDto sampleOrderDto, HttpServletResponse response){
+ @GetMapping("/rawAllInsOrderExport")
+ public void rawAllInsOrderExport(SampleOrderDto sampleOrderDto, HttpServletResponse response){
insOrderService.rawAllInsOrderExport(sampleOrderDto,response);
}
--
Gitblit v1.9.3