From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 65 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 27 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..44a6ab4 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
@@ -3,7 +3,9 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.inspect.dto.*;
import com.ruoyi.inspect.pojo.InsOrder;
@@ -17,6 +19,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,6 +43,7 @@
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@ApiOperation(value = "鏌ョ湅鎵�灞炲崟浣嶆楠屽崟")
@GetMapping("/selectInsOrderParameter")
+ @PreAuthorize("@ss.hasPermi('business:order:queryAll')")
public Result selectInsOrderParameter(Page page, SampleOrderDto sampleOrderDto) {
return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
}
@@ -52,40 +56,40 @@
}
//鐢ㄤ簬妫�楠屼笅鍗曞尯鍒煡鐪嬫墍鏈夎鍗曞拰鍙煡鐪嬪悓涓�涓鎵樺崟浣嶇殑璁㈠崟
- @ApiOperation(value = "鏌ョ湅鎵�鏈夋楠屽崟")
- @PostMapping("/selectAllInsOrderParameter")
- public Result selectAllInsOrderParameter() {
- return Result.success();
- }
+// @ApiOperation(value = "鏌ョ湅鎵�鏈夋楠屽崟")
+// @PostMapping("/selectAllInsOrderParameter")
+// public Result selectAllInsOrderParameter() {
+// return Result.success();
+// }
@ApiOperation(value = "鍒嗛厤鎸夐挳")
@PostMapping("/upInsOrder")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
public Result<?> upInsOrder(@RequestBody UpInsOrderDTO upInsOrderDTO) {
return Result.success(insOrderService.upInsOrder(upInsOrderDTO));
}
@ApiOperation(value = "涓嬪崟鎸夐挳")
@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")+"");
- List<List<Integer>> fiberPairing = JSON.parseArray(map.get("fiberPairing")+"");//鍏夌氦閰嶇疆閲岀殑鐔旀帴閰嶅
- return Result.success(insOrderService.addInsOrder(list, insOrder, pairing,fiberPairing));
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.INSERT)
+ public Result<?> addInsOrder(@RequestBody AddInsOrderDTO addInsOrderDTO) {
+ return Result.success(insOrderService.addInsOrder(
+ addInsOrderDTO.getList(),
+ addInsOrderDTO.getInsOrder(),
+ addInsOrderDTO.getPairing(),
+ addInsOrderDTO.getFiberPairing()));
}
@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")));
+ 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));
}
@@ -96,18 +100,21 @@
@ApiImplicitParam(name = "state", value = "瀹℃牳缁撴灉 1:閫氳繃 2锛氫笉閫氳繃", dataTypeClass = Integer.class)
})
@PostMapping("/upInsOrderOfState")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
return Result.success(insOrderService.upInsOrderOfState(insOrder));
}
@ApiOperation(value = "淇濆瓨妫�楠屾ā鏉挎寜閽�")
@PostMapping("/addInsOrderTemplate")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.INSERT)
public Result<?> addInsOrderTemplate(@RequestBody InsOrderTemplate insOrderTemplate) {
return Result.success(insOrderTemplateService.addInsOrderTemplate(insOrderTemplate));
}
@ApiOperation(value = "鍒犻櫎妫�楠屾ā鏉挎寜閽�")
@PostMapping("/delInsOrderTemplate")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.DELETE)
public Result<?> delInsOrderTemplate(Integer id) {
return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
}
@@ -119,15 +126,14 @@
}
@ApiOperation(value = "閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭")
- @PostMapping("/selectInsOrderTemplateById")
+ @GetMapping("/selectInsOrderTemplateById")
public Result<?> selectInsOrderTemplateById(Integer id) {
return Result.success( insOrderTemplateService.selectInsOrderTemplateById(id),"鎴愬姛");
}
@ApiOperation(value = "閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�")
- @PostMapping("/selectSampleAndProductByOrderId")
- public Result<?> selectSampleAndProductByOrderId(@RequestBody Map<String, Object> data) throws Exception {
- SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
+ @GetMapping("/selectSampleAndProductByOrderId")
+ public Result<?> selectSampleAndProductByOrderId(SampleProductDto2 sampleProductDto) {
return Result.success(insOrderService.selectSampleAndProductByOrderId(sampleProductDto));
}
//鏁版嵁鏌ョ湅涓嬬殑鏌ョ湅璇︽儏锛堝崟鏍瑰瀭鐩寸噧鐑у拰鏉惧绠�
@@ -138,12 +144,13 @@
@ApiOperation(value = "瀵煎嚭宸叉濮旀墭鍗�")
@PostMapping("/exportChecked")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.EXPORT)
public void exportChecked(@RequestBody Map<String, Object> data, HttpServletResponse response) {
insOrderService.exportChecked(data,response);
}
@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));
@@ -151,13 +158,14 @@
@ApiOperation(value = "鎾ら攢鎸夐挳")
@PutMapping("/updateStatus")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
public Result<?> updateStatus(Integer id) {
insOrderService.updateStatus(id);
return Result.success();
}
//寰呮鐨勬挙閿�鐨勬煡璇㈠緟妫�椤圭洰
- @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);
@@ -205,6 +213,7 @@
* @param data
* @return
*/
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
@PostMapping("/revoke")
public Result<?> revoke(@RequestBody Map<String, Object> data) {
insProductService.revoke(data);
@@ -249,13 +258,12 @@
return Result.success(insProductService.revokeReviewProduct(orderId,sampleId));
}
-
-
/**
* 鎾ら攢瀹℃牳閫氳繃
* @param orderId
* @return
*/
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
@GetMapping("/revocationPassed")
public Result<?> revocationPassed(Integer orderId){
insProductService.revocationPassed(orderId);
@@ -267,6 +275,7 @@
* @param orderId
* @return
*/
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
@GetMapping("/revocationCancel")
public Result<?> revocationCancel(Integer orderId){
insProductService.revocationCancel(orderId);
@@ -276,6 +285,7 @@
@ApiOperation(value = "寰呮鐨勬挙閿�")
@PutMapping("/updateInspected")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
public Result<?> updateInspected(Integer orderId,String ids){
insProductService.updateInspected(orderId,ids);
return Result.success();
@@ -283,19 +293,20 @@
@ApiOperation(value = "鎾ら攢瀹℃牳鎸夐挳")
@PostMapping("/checkUpdate")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
public Result<?> checkUpdate(Integer orderId,Integer state){
insProductService.checkUpdate(orderId,state);
return Result.success();
}
@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 +314,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