From dc9c6c612cde7b938c6851383b9da99abab025a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:02:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java | 86 ++++++++++++++++++++++++++++--------------
1 files changed, 57 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index fa50217..cc295d5 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -2,21 +2,22 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.pojo.QualityInspectParam;
-import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityInspectFileService;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
-import com.ruoyi.quality.service.IQualityUnqualifiedService;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -24,106 +25,133 @@
*/
@RestController
@RequestMapping("/quality/qualityInspect")
+@AllArgsConstructor
public class QualityInspectController {
- @Resource
private IQualityInspectService qualityInspectService;
-
- @Resource
private IQualityInspectParamService qualityInspectParamService;
-
- @Resource
private IQualityInspectFileService qualityInspectFileService;
/**
* 鏂板
+ *
* @param qualityInspectDto
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody QualityInspectDto qualityInspectDto) {
- return AjaxResult.success(qualityInspectService.add(qualityInspectDto));
+ @Operation(summary = "鏂板妫�楠�")
+ @Log(title = "鏂板妫�楠�", businessType = BusinessType.INSERT)
+ public R<?> add(@RequestBody QualityInspectDto qualityInspectDto) {
+ return R.ok(qualityInspectService.add(qualityInspectDto));
}
/**
* 鍒犻櫎
+ *
* @param ids
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
- if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ @Operation(summary = "鍒犻櫎妫�楠�")
+ @Log(title = "鍒犻櫎妫�楠�", businessType = BusinessType.DELETE)
+ public R<?> delQualityInspect(@RequestBody List<Integer> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ //濡傛灉宸茬粡鎻愪氦灏变笉鍏佽鍒犻櫎
+ List<QualityInspect> qualityInspects = qualityInspectService.listByIds(ids);
+ for (QualityInspect qualityInspect : qualityInspects) {
+ if (qualityInspect.getInspectState() == 1) {
+ throw new RuntimeException("宸叉彁浜ょ殑鏁版嵁涓嶅厑璁稿垹闄�");
+ }
}
//鍒犻櫎妫�楠屽弬鏁�
qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery()
- .in(QualityInspectParam::getInspectId,ids));
+ .in(QualityInspectParam::getInspectId, ids));
//鍒犻櫎妫�楠岄檮浠�
qualityInspectFileService.remove(Wrappers.<QualityInspectFile>lambdaQuery()
- .in(QualityInspectFile::getInspectId,ids));
+ .in(QualityInspectFile::getInspectId, ids));
//鍒犻櫎妫�楠屽崟
- return AjaxResult.success(qualityInspectService.removeBatchByIds(ids));
+ return R.ok(qualityInspectService.removeBatchByIds(ids));
}
/**
* 璇︽儏
+ *
* @param id
* @return
*/
@GetMapping("/{id}")
- public AjaxResult QualityInspectDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityInspectService.getDetailById(id));
+ @Operation(summary = "妫�楠岃鎯�")
+ @Log(title = "妫�楠岃鎯�", businessType = BusinessType.OTHER)
+ public R<?> QualityInspectDetail(@PathVariable("id") Integer id) {
+ return R.ok(qualityInspectService.getDetailById(id));
}
/**
* 淇敼
+ *
* @param qualityInspectDto
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody QualityInspectDto qualityInspectDto) {
- return AjaxResult.success(qualityInspectService.updateQualityInspect(qualityInspectDto));
+ @Operation(summary = "淇敼妫�楠�")
+ @Log(title = "淇敼妫�楠�", businessType = BusinessType.UPDATE)
+ public R<?> update(@RequestBody QualityInspectDto qualityInspectDto) {
+ return R.ok(qualityInspectService.updateQualityInspect(qualityInspectDto));
}
/**
- *鍒嗛〉鏌ヨ
+ * 鍒嗛〉鏌ヨ
+ *
* @param page
* @param qualityInspect
* @return
*/
@GetMapping("/listPage")
- public AjaxResult qualityInspectListPage(Page page, QualityInspect qualityInspect) {
- return AjaxResult.success(qualityInspectService.qualityInspectListPage(page, qualityInspect));
+ @Operation(summary = "鍒嗛〉鏌ヨ妫�楠�")
+ @Log(title = "鍒嗛〉鏌ヨ妫�楠�", businessType = BusinessType.OTHER)
+ public R<?> qualityInspectListPage(Page page, QualityInspectDto qualityInspect) {
+ return R.ok(qualityInspectService.qualityInspectListPage(page, qualityInspect));
}
/**
* 瀵煎嚭
+ *
* @param response
* @param qualityInspect
*/
@PostMapping("/export")
- public void qualityInspectExport(HttpServletResponse response,QualityInspect qualityInspect) {
+ @Operation(summary = "瀵煎嚭妫�楠�")
+ @Log(title = "瀵煎嚭妫�楠�", businessType = BusinessType.EXPORT)
+ public void qualityInspectExport(HttpServletResponse response, QualityInspect qualityInspect) {
qualityInspectService.qualityInspectExport(response, qualityInspect);
}
/**
* 鎻愪氦
+ *
* @param qualityInspect
* @return
*/
@PostMapping("/submit")
- public AjaxResult submit(@RequestBody QualityInspect qualityInspect) {
- return AjaxResult.success(qualityInspectService.submit(qualityInspect));
+ @Operation(summary = "鎻愪氦妫�楠�")
+ @Log(title = "鎻愪氦妫�楠�", businessType = BusinessType.OTHER)
+ public R<?> submit(@RequestBody QualityInspect qualityInspect) {
+ return R.ok(qualityInspectService.submit(qualityInspect));
}
/**
* 涓嬭浇
+ *
* @param response
* @param qualityInspect
*/
@PostMapping("/down")
- public void down(HttpServletResponse response,@RequestBody QualityInspect qualityInspect) {
+ @Operation(summary = "涓嬭浇妫�楠�")
+ @Log(title = "涓嬭浇妫�楠�", businessType = BusinessType.OTHER)
+ public void down(HttpServletResponse response, @RequestBody QualityInspect qualityInspect) {
qualityInspectService.down(response, qualityInspect);
}
}
--
Gitblit v1.9.3