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/ServiceDonateorganController.java | 191 +++++++++++++++++++++++++++++------------------
1 files changed, 118 insertions(+), 73 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
index 5d51c31..ef5f73b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
@@ -1,69 +1,77 @@
package com.ruoyi.web.controller.project;
-import java.util.Arrays;
-import java.util.List;
-
-import com.ruoyi.project.domain.BaseOrganization;
-import com.ruoyi.project.domain.ServiceDonatebaseinfo;
-import com.ruoyi.project.domain.vo.DonateOrganVO;
-import com.ruoyi.project.domain.vo.NumberOfOrgans;
-import com.ruoyi.project.domain.vo.TimeVO;
-import com.ruoyi.project.mapper.BaseOrganizationMapper;
-import com.ruoyi.project.service.IServiceDonatebaseinfoService;
-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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.project.domain.ServiceDonateorgan;
-import com.ruoyi.project.service.IServiceDonateorganService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.ServiceDonatecomporgan;
+import com.ruoyi.project.domain.ServiceDonateorgan;
+import com.ruoyi.project.domain.ServiceDonateorganVO;
+import com.ruoyi.project.domain.ServiceOrganallocation;
+import com.ruoyi.project.domain.vo.DonateOrganVO;
+import com.ruoyi.project.domain.vo.TimeVO;
+import com.ruoyi.project.service.IServiceDonateorganService;
+import com.ruoyi.project.service.IServiceOrganallocationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
/**
* 鎹愮尞鍣ㄥ畼绠＄悊Controller
- *
+ *
* @author ruoyi
* @date 2021-11-10
*/
+@Slf4j
@Api("鎹愮尞鍣ㄥ畼绠＄悊")
@RestController
@RequestMapping("/project/donateorgan")
-public class ServiceDonateorganController extends BaseController
-{
+public class ServiceDonateorganController extends BaseController {
@Autowired
private IServiceDonateorganService serviceDonateorganService;
+ @Autowired
+ private IServiceOrganallocationService serviceOrganallocationService;
/**
* 鏌ヨ鎹愮尞鍣ㄥ畼绠＄悊鍒楄〃
*/
@ApiOperation("鎹愮尞鍣ㄥ畼鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donateorgan:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:donateorgan:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceDonateorgan serviceDonateorgan)
- {
+ public TableDataInfo list(ServiceDonateorgan serviceDonateorgan) {
startPage();
List<ServiceDonateorgan> list = serviceDonateorganService.queryList(serviceDonateorgan);
return getDataTable(list);
}
+
+ /**
+ * 鍣ㄥ畼鍒嗛厤绱
+ */
+ @ApiOperation("鍣ㄥ畼鍒嗛厤绱")
+ @GetMapping("/countList")
+ public TableDataInfo countList(ServiceDonateorgan serviceDonateorgan) {
+ startPage();
+ List<ServiceDonateorgan> list = serviceDonateorganService.countList(serviceDonateorgan);
+ return getDataTable(list);
+ }
+
@GetMapping("/listnew")
- public TableDataInfo listnew (DonateOrganVO donateOrganVO)
- {
+ public TableDataInfo listnew(DonateOrganVO donateOrganVO) {
startPage();
List<DonateOrganVO> list = serviceDonateorganService.selectVOList(donateOrganVO);
return getDataTable(list);
@@ -74,11 +82,10 @@
* 瀵煎嚭鎹愮尞鍣ㄥ畼绠＄悊鍒楄〃
*/
@ApiOperation("瀵煎嚭鎹愮尞鍣ㄥ畼鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donateorgan:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:donateorgan:export')")
@Log(title = "鎹愮尞鍣ㄥ畼绠＄悊", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceDonateorgan serviceDonateorgan)
- {
+ public AjaxResult export(ServiceDonateorgan serviceDonateorgan) {
List<ServiceDonateorgan> list = serviceDonateorganService.queryList(serviceDonateorgan);
ExcelUtil<ServiceDonateorgan> util = new ExcelUtil<ServiceDonateorgan>(ServiceDonateorgan.class);
return util.exportExcel(list, "鎹愮尞鍣ㄥ畼绠＄悊鏁版嵁");
@@ -88,10 +95,9 @@
* 鑾峰彇鎹愮尞鍣ㄥ畼绠＄悊璇︾粏淇℃伅
*/
@ApiOperation("閫氳繃id鑾峰緱鎹愮尞鍣ㄥ畼淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donateorgan:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:donateorgan:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonateorganService.getById(id));
}
@@ -99,41 +105,63 @@
* 鏂板鎹愮尞鍣ㄥ畼绠＄悊
*/
@ApiOperation("鏂板鎹愮尞鍣ㄥ畼淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donateorgan:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:donateorgan:add')")
@Log(title = "鎹愮尞鍣ㄥ畼绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceDonateorgan serviceDonateorgan)
- {
+ public AjaxResult add(@RequestBody ServiceDonateorgan serviceDonateorgan) {
String organNumber = serviceDonateorgan.getDonorno() + "." + serviceDonateorgan.getOrganno();
- if (organNumber == "")
- {
+ if (organNumber == "") {
return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿涓虹┖,鍒涘缓澶辫触!");
- }
- else
- {
+ } else {
ServiceDonateorgan serviceDonateorgan1 = new ServiceDonateorgan();
serviceDonateorgan1.setOrgannumber(organNumber);
List<ServiceDonateorgan> listrecord = serviceDonateorganService.queryList(serviceDonateorgan);
- if (listrecord.size()>0)
- {
- return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿"+ organNumber +"宸插瓨鍦�,鏃犳硶淇濆瓨!");
+ if (listrecord.size() > 0) {
+ return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿" + organNumber + "宸插瓨鍦�,鏃犳硶淇濆瓨!");
}
}
serviceDonateorgan.setOrgannumber(organNumber);
- return toAjax(serviceDonateorganService.save(serviceDonateorgan));
+ boolean save = serviceDonateorganService.save(serviceDonateorgan);
+ return AjaxResult.success(serviceDonateorgan);
+ }
+
+
+ /**
+ * 鏂板鎹愮尞鍣ㄥ畼绠＄悊
+ */
+ @ApiOperation("鏂板鎹愮尞鍣ㄥ畼淇℃伅")
+ //// @PreAuthorize("@ss.hasPermi('project:donateorgan:add')")
+ @Log(title = "鎹愮尞鍣ㄥ畼绠＄悊", businessType = BusinessType.INSERT)
+ @PostMapping("/addData")
+ @RepeatSubmit
+ public TableDataInfo addData(@RequestBody List<ServiceDonateorgan> serviceDonateorgans) {
+ List<ServiceDonateorgan> serviceDonateorgans1 = serviceDonateorganService.saveData(serviceDonateorgans);
+ return saveDataTable(serviceDonateorgans1);
+ }
+
+
+ /**
+ * 淇敼鍣ㄥ畼鍒嗛厤
+ */
+ @ApiOperation("淇敼鍣ㄥ畼鍒嗛厤淇℃伅")
+ //// @PreAuthorize("@ss.hasPermi('project:organallocation:edit')")
+ @Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.UPDATE)
+ @PostMapping("/editarraydata")
+ @RepeatSubmit
+ public AjaxResult editArrayData(@RequestBody List<ServiceDonateorgan> serviceDonateorgans) {
+ return AjaxResult.success(serviceDonateorganService.editArrayData(serviceDonateorgans));
}
/**
* 淇敼鎹愮尞鍣ㄥ畼绠＄悊
*/
@ApiOperation("淇敼鎹愮尞鍣ㄥ畼淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donateorgan:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:donateorgan:edit')")
@Log(title = "鎹愮尞鍣ㄥ畼绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceDonateorgan serviceDonateorgan)
- {
+ @PostMapping("/edit")
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceDonateorgan serviceDonateorgan) {
return toAjax(serviceDonateorganService.updateById(serviceDonateorgan));
}
@@ -141,30 +169,29 @@
* 鍒犻櫎鎹愮尞鍣ㄥ畼绠＄悊
*/
@ApiOperation("鍒犻櫎鎹愮尞鍣ㄥ畼淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donateorgan:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:donateorgan: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(serviceDonateorganService.removeByIds(Arrays.asList(ids)));
}
@ApiOperation("寰楀埌娴欐睙鍚勫競涓嬬殑鎹愮尞淇℃伅")
@GetMapping("/numberOfOrgans")
- public AjaxResult numberOfOrgans(){
+ public AjaxResult numberOfOrgans() {
return AjaxResult.success(serviceDonateorganService.getNumberOfOrgans());
}
@ApiOperation("寰楀埌鍚勫尰闄㈢殑鎹愮尞淇℃伅")
@PostMapping("/OrgansOfHospital")
- public AjaxResult OrgansOfHospital(String cityName){
+ public AjaxResult OrgansOfHospital(String cityName) {
return AjaxResult.success(serviceDonateorganService.getOrgansOfHospital(cityName));
}
@ApiOperation("鍏ㄧ渷鎹愮尞鍣ㄥ畼淇℃伅姹囨��")
@GetMapping("/allOrgansInfo")
- public AjaxResult allOrgansInfo(TimeVO timeVO){
+ public AjaxResult allOrgansInfo(TimeVO timeVO) {
return AjaxResult.success(serviceDonateorganService.getAllOrgansInfo(timeVO));
}
@@ -219,46 +246,64 @@
@ApiOperation("鎸夋湀搴︾粺璁＄殑鍚勫尰闄㈢殑鎹愮尞淇℃伅")
@GetMapping("/OrgansOfHospitalByMonth")
- public AjaxResult OrgansOfHospitalByMonth(TimeVO timeVO){
+ public AjaxResult OrgansOfHospitalByMonth(TimeVO timeVO) {
return AjaxResult.success(serviceDonateorganService.OrgansOfHospitalByMonth(timeVO));
}
@ApiOperation("鎸夋椂闂寸粺璁＄殑鍚勫尰闄㈢殑鎹愮尞淇℃伅")
@GetMapping("/OrgansOfHospitalByTime")
- public AjaxResult OrgansOfHospitalByTime(TimeVO timeVO){
+ public AjaxResult OrgansOfHospitalByTime(TimeVO timeVO) {
return AjaxResult.success(serviceDonateorganService.OrgansOfHospitalByTime(timeVO));
}
@ApiOperation("姣忕櫨涓囦汉鍙ｇ殑鎹愮尞鐜�")
@GetMapping("/getPMPRate")
- public AjaxResult getPMPRate(TimeVO timeVO){
+ public AjaxResult getPMPRate(TimeVO timeVO) {
return AjaxResult.success(serviceDonateorganService.getPMPRate(timeVO));
}
@ApiOperation("鏍规嵁鍦板競杩斿洖鎹愮尞銆佸畬鎴愩�佸櫒瀹樻暟")
@GetMapping("/getDistrictDonateCalculate")
- public AjaxResult getDistrictDonateCalculate(){
+ public AjaxResult getDistrictDonateCalculate() {
return AjaxResult.success(serviceDonateorganService.getDistrictDonateCalculate());
}
@ApiOperation("鏍规嵁鏃堕棿鍦板競杩斿洖鎹愮尞銆佸畬鎴愩�佸櫒瀹樻暟")
@GetMapping("/getDistrictDonateCalculateByTime")
- public AjaxResult getDistrictDonateCalculateByTime(TimeVO timeVO){
+ public AjaxResult getDistrictDonateCalculateByTime(TimeVO timeVO) {
return AjaxResult.success(serviceDonateorganService.getDistrictDonateCalculateByTime(timeVO));
}
@ApiOperation("鏍规嵁鏈烘瀯杩斿洖鍣ㄥ畼鎬绘暟")
@GetMapping("/getOrganNumberByOrg")
- public AjaxResult getOrganNumberByOrg(TimeVO timeVO){
+ public AjaxResult getOrganNumberByOrg(TimeVO timeVO) {
return AjaxResult.success(serviceDonateorganService.getOrganNumberByOrg(timeVO));
}
@ApiOperation("杩斿洖鍣ㄥ畼鎬绘暟")
@GetMapping("/getOrganCount")
- public AjaxResult getOrganCount(TimeVO timeVO){
+ public AjaxResult getOrganCount(TimeVO timeVO) {
return AjaxResult.success(serviceDonateorganService.getOrganCount(timeVO));
}
-
+ @RepeatSubmit
+ @ApiOperation("鏂板鎴栦慨鏀规崘鐚櫒瀹樼鐞�")
+ @Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE)
+ @PostMapping("/saveOrUpdateDonateorgan")
+ public AjaxResult saveOrUpdateDonateorgan(@RequestBody List<ServiceDonateorgan> serviceDonateorganList) {
+ if (CollectionUtils.isEmpty(serviceDonateorganList)) {
+ throw new BaseException("璇锋鏌ラ渶瑕佹柊澧炴垨淇敼鐨勬崘鐚櫒瀹樼鐞嗗弬鏁版槸鍚﹀畬鏁�");
+ }
+ Boolean i = null;
+ for (ServiceDonateorgan serviceDonateorgan : serviceDonateorganList) {
+ log.info("鎹愮尞鍣ㄥ畼绉绘id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonateorgan.getId(), serviceDonateorgan.getInfoid());
+ if (serviceDonateorgan.getId() == null) {
+ i = serviceDonateorganService.save(serviceDonateorgan);
+ } else {
+ i = serviceDonateorganService.updateById(serviceDonateorgan);
+ }
+ }
+ return toAjax(i);
+ }
}
--
Gitblit v1.9.3