From 0879a157fd7c85ec34f1dac51a2b113bf1f5f2f6 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 07 六月 2024 15:53:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/controller/admin/ExamTemplateController.java | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamTemplateController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamTemplateController.java
index 4ea99c1..4de12c9 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamTemplateController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamTemplateController.java
@@ -1,80 +1,87 @@
package com.ycl.jxkg.controller.admin;
+import com.ycl.jxkg.base.SystemCode;
+import com.ycl.jxkg.group.Update;
+import com.ycl.jxkg.group.Add;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import lombok.RequiredArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import javax.validation.constraints.NotEmpty;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.ycl.jxkg.service.ExamTemplateService;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.form.ExamTemplateForm;
import com.ycl.jxkg.domain.query.ExamTemplateQuery;
-import com.ycl.jxkg.group.Add;
-import com.ycl.jxkg.group.Update;
-import com.ycl.jxkg.service.ExamTemplateService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
+import static com.ycl.jxkg.enums.DeductTypeEnum.EachCorrect;
+import static com.ycl.jxkg.enums.DeductTypeEnum.PartCorrect;
/**
* 闅忔満璇曞嵎妯℃澘 鍓嶇鎺у埗鍣�
*
- * @author 寮�鍙戜汉鍛樺悕瀛�
- * @since 2024-06-03
+ * @author flq
+ * @since 2024-06-05
*/
@Validated
@RequiredArgsConstructor
@Api(value = "闅忔満璇曞嵎妯℃澘", tags = "闅忔満璇曞嵎妯℃澘绠＄悊")
@RestController
-@RequestMapping("/exam-template")
+@RequestMapping("/api/admin/exam-template")
public class ExamTemplateController {
private final ExamTemplateService examTemplateService;
-
@PostMapping
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
- @PreAuthorize("hasAuthority('examTemplate:add')")
public Result add(@RequestBody @Validated(Add.class) ExamTemplateForm form) {
+ //鍙傛暟鏍￠獙
+ if(form.getDeductType()!=null && (form.getDeductType() ==PartCorrect.getCode() || form.getDeductType() == EachCorrect.getCode()) && (form.getDeductTypeScore() ==null || form.getDeductTypeScore().compareTo(BigDecimal.ZERO) <= 0)){
+ return Result.fail(SystemCode.ParameterValidError.getCode(),"澶氶�夎瘎鍒嗕笉鑳戒负0鎴栫┖");
+ }
return examTemplateService.add(form);
}
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
- @PreAuthorize("hasAuthority('examTemplate:edit')")
public Result update(@RequestBody @Validated(Update.class) ExamTemplateForm form) {
+ //鍙傛暟鏍￠獙
+ if(form.getDeductType()!=null && (form.getDeductType() ==PartCorrect.getCode() || form.getDeductType() == EachCorrect.getCode()) && (form.getDeductTypeScore() ==null || form.getDeductTypeScore().compareTo(BigDecimal.ZERO) <= 0)){
+ return Result.fail(SystemCode.ParameterValidError.getCode(),"澶氶�夎瘎鍒嗕笉鑳戒负0鎴栫┖");
+ }
return examTemplateService.update(form);
}
@DeleteMapping("/{id}")
@ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
- @PreAuthorize("hasAuthority('examTemplate:del')")
public Result removeById(@PathVariable("id") String id) {
return examTemplateService.removeById(id);
}
@DeleteMapping("/batch")
@ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
- @PreAuthorize("hasAuthority('examTemplate:del:batch')")
public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
return examTemplateService.remove(ids);
}
@GetMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- @PreAuthorize("hasAuthority('examTemplate:page')")
public Result page(ExamTemplateQuery query) {
return examTemplateService.page(query);
}
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- @PreAuthorize("hasAuthority('examTemplate:detail')")
public Result detail(@PathVariable("id") Integer id) {
return examTemplateService.detail(id);
}
@GetMapping("/list")
- @PreAuthorize("hasAuthority('examTemplate:list')")
@ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
public Result list() {
return examTemplateService.all();
--
Gitblit v1.8.0