From 087991c76f078defe5eb55d84223021b4199fb3d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 17 二月 2025 11:22:50 +0800
Subject: [PATCH] 设备模块修改bug
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java | 66 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
index 7f4579b..66d3e63 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
@@ -1,23 +1,20 @@
package com.yuanchu.mom.controller;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
-import com.yuanchu.mom.dto.UserDto;
import com.yuanchu.mom.pojo.Department;
+import com.yuanchu.mom.pojo.DepartmentLims;
+import com.yuanchu.mom.service.DepartmentLimsService;
import com.yuanchu.mom.service.DepartmentService;
-import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import java.util.Map;
-
/**
* <p>
- * 閮ㄩ棬鏄庣粏 鍓嶇鎺у埗鍣�
+ * 缁勭粐鏋舵瀯鏄庣粏 鍓嶇鎺у埗鍣�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -29,32 +26,61 @@
@RequestMapping("/department")
public class DepartmentController {
- DepartmentService departmentService;
- @ValueClassify("浜哄憳鏄庣粏")
- @ApiOperation(value = "娣诲姞閮ㄩ棬")
+ private DepartmentService departmentService;
+
+ private DepartmentLimsService departmentLimsService;
+
+ @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ApiOperation(value = "娣诲姞缁勭粐鏋舵瀯")
@PostMapping("/addDepartment")
public Result addDepartment(@RequestBody Department department) {
return Result.success(departmentService.addDepartment(department));
}
- @ApiOperation(value = "鑾峰彇閮ㄩ棬鏍�")
+ @ApiOperation(value = "鑾峰彇缁勭粐鏋舵瀯鏍�")
@GetMapping("/selectDepartment")
- @ValueClassify("浜哄憳鏄庣粏")
+ @ValueClassify("鐢ㄦ埛绠＄悊")
public Result selectDepartment() {
return Result.success(departmentService.selectDepartment());
}
- @ValueClassify("浜哄憳鏄庣粏")
- @ApiOperation(value = "鍒犻櫎閮ㄩ棬")
+ @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ApiOperation(value = "鍒犻櫎缁勭粐鏋舵瀯")
@PostMapping("/delDepartment")
public Result delDepartment(Integer id) {
return Result.success(departmentService.delDepartment(id));
}
- @ValueAuth
- @ApiOperation(value = "鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�")
- @PostMapping("/showUserById")
- public Result showUserById(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- UserDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserDto.class);
- return Result.success(departmentService.showUserById(page, user));
+
+ @ValueClassify("浜哄憳鏄庣粏")
+ @ApiOperation(value = "鑾峰彇缁勭粐鏋舵瀯鏍�")
+ @GetMapping("/selectDepartmentLim")
+ public Result selectDepartmentLim() {
+ return Result.success(departmentLimsService.selectDepartment());
}
+ @ValueClassify("浜哄憳鏄庣粏")
+ @ApiOperation(value = "娣诲姞缁勭粐鏋舵瀯")
+ @PostMapping("/addDepartmentLims")
+ public Result addDepartmentLims(@RequestBody DepartmentLims department) {
+ return Result.success(departmentLimsService.addDepartment(department));
+ }
+
+ @ValueClassify("浜哄憳鏄庣粏")
+ @ApiOperation(value = "鍒犻櫎缁勭粐鏋舵瀯")
+ @PostMapping("/delDepartmentLims")
+ public Result delDepartmentLims(Integer id) {
+ return Result.success(departmentLimsService.delDepartment(id));
+ }
+
+ @ValueAuth
+ @ApiOperation(value = "鑾峰彇缁勭粐鏋舵瀯鏋氫妇")
+ @GetMapping("/selectDepartmentEnum")
+ public Result selectDepartmentEnum() {
+ return Result.success(departmentService.selectDepartmentEnum());
+ }
+
+ @ValueAuth
+ @ApiOperation(value = "鑾峰彇鐢ㄦ埛绠＄悊缁勭粐鏋舵瀯鏋氫妇")
+ @GetMapping("/selectDepartmentLimsEnum")
+ public Result selectDepartmentLimsEnum() {
+ return Result.success(departmentLimsService.selectDepartmentLimsEnum());
+ }
}
--
Gitblit v1.9.3