From 71a860affbf97e7be13a2059b6cb001bfd368adb Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期日, 28 四月 2024 14:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
index e994f2c..926449b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.pojo.Certification;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.CertificationService;
@@ -25,29 +26,24 @@
private CertificationService certificationService;
- @ApiOperation(value = "鏌ヨ璧勮川鏄庣粏鍒楄〃")
+ @ApiOperation(value = "璧勮川璇存槑-鏌ヨ璧勮川鏄庣粏鍒楄〃")
@PostMapping("/getCertificationDetail")
public Result getCertificationDetail(@RequestBody Map<String, Object> data) throws Exception {
+ System.out.println(data);
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
Certification certification = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Certification.class);
return Result.success(certificationService.getCertificationDetail(page, certification));
}
- @ApiOperation(value = "娣诲姞璧勮川鏄庣粏鍒楄〃")
+ @ApiOperation(value = "璧勮川璇存槑-娣诲姞璧勮川鏄庣粏鍒楄〃")
@PostMapping("/addCertificationDetail")
public Result addCertificationDetail(@RequestBody Certification certification) {
return Result.success(certificationService.addCertificationDetail(certification));
}
- @ApiOperation(value = "鍒犻櫎璧勮川鏄庣粏鍒楄〃")
+ @ApiOperation(value = "璧勮川璇存槑-鍒犻櫎璧勮川鏄庣粏鍒楄〃")
@PostMapping("/delCertificationDetail")
- public Result<?> delCertificationDetail(List<Integer> ids) {
+ public Result<?> delCertificationDetail( String ids) {
return Result.success(certificationService.delCertificationDetail(ids));
- }
-
- @ApiOperation(value = "闄勪欢涓嬭浇")
- @PostMapping("/downFile")
- public Result<?> downFile(Integer id) {
- return Result.success(certificationService.downFile(id));
}
}
--
Gitblit v1.9.3