From 0293e06edd011d6921ec2cc08392042f5765dfb8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 18 九月 2025 13:35:54 +0800
Subject: [PATCH] 日志修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java | 70 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
index 2d9e1f1..24cbe39 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
@@ -1,13 +1,19 @@
package com.ruoyi.web.controller.project;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
+import com.ruoyi.common.annotation.NotRepeatCommit;
+import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -28,15 +34,14 @@
/**
* 鍖诲璇勪及Controller
- *
+ *
* @author ruoyi
* @date 2021-11-19
*/
@Api("鍖荤枟璇勪及绠＄悊")
@RestController
@RequestMapping("/project/medicalevaluation")
-public class ServiceMedicalevaluationController extends BaseController
-{
+public class ServiceMedicalevaluationController extends BaseController {
@Autowired
private IServiceMedicalevaluationService serviceMedicalevaluationService;
@@ -44,10 +49,9 @@
* 鏌ヨ鍖诲璇勪及鍒楄〃
*/
@ApiOperation("鑾峰彇鍖荤枟璇勪及鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceMedicalevaluation serviceMedicalevaluation)
- {
+ public TableDataInfo list(ServiceMedicalevaluation serviceMedicalevaluation) {
startPage();
List<ServiceMedicalevaluation> list = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
return getDataTable(list);
@@ -55,9 +59,18 @@
@ApiOperation("鑾峰彇鍖荤枟璇勪及鍒楄〃鏂�")
@GetMapping("/listnew")
- public TableDataInfo listnew(MedicalEvaluationVO medicalEvaluationVO){
+ public TableDataInfo listnew(MedicalEvaluationVO medicalEvaluationVO) {
startPage();
List<MedicalEvaluationVO> list = serviceMedicalevaluationService.selectVOList(medicalEvaluationVO);
+ for (MedicalEvaluationVO medicalEvaluationVO1 : list) {
+ if (medicalEvaluationVO1.getBirthday() != null) {
+ Map<String, String> map = CalculateDateUtils.calculateAge(medicalEvaluationVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
+ medicalEvaluationVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
+ medicalEvaluationVO1.setAgeunit(map.get("ageUnit"));
+ medicalEvaluationVO1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
+ medicalEvaluationVO1.setAgeunit2(map.get("ageUnit2"));
+ }
+ }
return getDataTable(list);
}
@@ -65,11 +78,10 @@
* 瀵煎嚭鍖诲璇勪及鍒楄〃
*/
@ApiOperation("瀵煎嚭鍖荤枟璇勪及鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:export')")
@Log(title = "鍖诲璇勪及", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceMedicalevaluation serviceMedicalevaluation)
- {
+ public AjaxResult export(ServiceMedicalevaluation serviceMedicalevaluation) {
List<ServiceMedicalevaluation> list = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
ExcelUtil<ServiceMedicalevaluation> util = new ExcelUtil<ServiceMedicalevaluation>(ServiceMedicalevaluation.class);
return util.exportExcel(list, "鍖诲璇勪及鏁版嵁");
@@ -79,10 +91,9 @@
* 鑾峰彇鍖诲璇勪及璇︾粏淇℃伅
*/
@ApiOperation("閫氳繃id鑾峰彇鍖荤枟璇勪及淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceMedicalevaluationService.getById(id));
}
@@ -90,25 +101,29 @@
* 鏂板鍖诲璇勪及
*/
@ApiOperation("鏂板鍖诲璇勪及")
- //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:add')")
@Log(title = "鍖诲璇勪及", businessType = BusinessType.INSERT)
- @PostMapping
- @RepeatSubmit
- public AjaxResult add(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation)
- {
- return toAjax(serviceMedicalevaluationService.save(serviceMedicalevaluation));
+ @PostMapping("/add")
+// @NotRepeatCommit(key = "param:arg[1]", value = 30000)
+ public AjaxResult add(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation) {
+ boolean save = serviceMedicalevaluationService.save(serviceMedicalevaluation);
+ return AjaxResult.success(serviceMedicalevaluation);
}
/**
* 淇敼鍖诲璇勪及
*/
@ApiOperation("淇敼鍖诲璇勪及")
- //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:edit')")
@Log(title = "鍖诲璇勪及", businessType = BusinessType.UPDATE)
- @PutMapping
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation)
- {
+ @PostMapping("/edit")
+// @NotRepeatCommit(key = "param:arg[1]", value = 30000)
+ public AjaxResult edit(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation) {
+ List<ServiceMedicalevaluation> list = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
+ if (CollectionUtils.isEmpty(list)) {
+ return error("鍖诲璇勪及鏁版嵁涓嶅瓨鍦�,璇锋鏌ュ悗鍐嶆淇敼");
+ }
+ serviceMedicalevaluation.setId(list.get(0).getId());
return toAjax(serviceMedicalevaluationService.updateById(serviceMedicalevaluation));
}
@@ -116,11 +131,10 @@
* 鍒犻櫎鍖诲璇勪及
*/
@ApiOperation("鍒犻櫎鍖诲璇勪及")
- //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:remove')")
@Log(title = "鍖诲璇勪及", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceMedicalevaluationService.removeByIds(Arrays.asList(ids)));
}
}
--
Gitblit v1.9.3