From 054cb61d01250a5fab990f2d01574134ecdf4488 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 05 二月 2024 14:25:29 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
index 8edcd2e..9266c9a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
@@ -9,8 +9,10 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.BaseOrganization;
import com.ruoyi.project.service.IBaseOrganizationService;
+import com.ruoyi.web.controller.common.OnlyValueCommon;
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.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -20,17 +22,20 @@
/**
* 鏈烘瀯绠＄悊Controller
- *
+ *
* @author ruoyi
* @date 2021-11-05
*/
+@Slf4j
@Api("鏈烘瀯淇℃伅绠＄悊")
@RestController
@RequestMapping("/project/organization")
-public class BaseOrganizationController extends BaseController
-{
+public class BaseOrganizationController extends BaseController {
@Autowired
private IBaseOrganizationService baseOrganizationService;
+
+ @Autowired
+ private OnlyValueCommon onlyValueCommon;
/**
* 鏌ヨ鏈烘瀯绠＄悊鍒楄〃
@@ -38,8 +43,8 @@
@ApiOperation("鑾峰彇鏈烘瀯鍒楄〃")
//@PreAuthorize("@ss.hasPermi('project:organization:list')")
@GetMapping("/list")
- public TableDataInfo list(BaseOrganization baseOrganization)
- {
+ public TableDataInfo list(BaseOrganization baseOrganization) {
+ log.info("鑾峰彇鏈烘瀯鍒楄〃{}锛�", baseOrganization);
startPage();
List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
return getDataTable(list);
@@ -52,8 +57,8 @@
//@PreAuthorize("@ss.hasPermi('project:organization:export')")
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(BaseOrganization baseOrganization)
- {
+ public AjaxResult export(BaseOrganization baseOrganization) {
+ log.info("瀵煎嚭鏈烘瀯淇℃伅{}锛�", baseOrganization);
List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
ExcelUtil<BaseOrganization> util = new ExcelUtil<BaseOrganization>(BaseOrganization.class);
return util.exportExcel(list, "鏈烘瀯绠＄悊鏁版嵁");
@@ -65,8 +70,8 @@
@ApiOperation("閫氳繃鏈烘瀯id鑾峰彇鏈烘瀯淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:organization:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("鑾峰彇鏈烘瀯绠＄悊璇︾粏淇℃伅{}锛�", id);
return AjaxResult.success(baseOrganizationService.getById(id));
}
@@ -76,11 +81,17 @@
@ApiOperation("鏂板鏈烘瀯淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:organization:add')")
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody BaseOrganization baseOrganization)
- {
- return toAjax(baseOrganizationService.save(baseOrganization));
+ public AjaxResult add(@RequestBody BaseOrganization baseOrganization) {
+ log.info("鏂板鏈烘瀯淇℃伅{}锛�", baseOrganization);
+ String organization = onlyValueCommon.addOnlyValue("organization");
+ //"0"+鍦板競缂栫爜+鍖婚櫌绫诲瀷+搴忓彿
+ baseOrganization.setOrganizationid("0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature() + organization);
+
+ boolean save = baseOrganizationService.save(baseOrganization);
+ log.info("鏂板鏈烘瀯淇℃伅baseOrganization鐨処D{}锛�", baseOrganization.getId());
+ return AjaxResult.success(baseOrganization);
}
/**
@@ -89,10 +100,10 @@
@ApiOperation("淇敼鏈烘瀯淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:organization:edit')")
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- @RepeatSubmit
- public AjaxResult edit(@RequestBody BaseOrganization baseOrganization)
- {
+ @PostMapping("/edit")
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody BaseOrganization baseOrganization) {
+ log.info("淇敼鏈烘瀯淇℃伅{}锛�", baseOrganization);
return toAjax(baseOrganizationService.updateById(baseOrganization));
}
@@ -102,9 +113,9 @@
@ApiOperation("鍒犻櫎鏈烘瀯淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:organization:remove')")
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎鏈烘瀯淇℃伅{}锛�", ids);
return toAjax(baseOrganizationService.removeByIds(Arrays.asList(ids)));
}
--
Gitblit v1.9.3