From 2bfebb31df25d8ddc0c5ccaff4bed91d87e1070b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 17:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java | 115 ++++++++++++++++++++++-----------------------------------
1 files changed, 44 insertions(+), 71 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java b/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
index c6e21c4..b4acd36 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
@@ -1,20 +1,19 @@
package com.yuanchu.mom.controller;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.pojo.CustomEnum;
-import com.yuanchu.mom.pojo.ProductEnum;
-import com.yuanchu.mom.pojo.Role;
-import com.yuanchu.mom.pojo.User;
-import com.yuanchu.mom.service.CustomEnumService;
-import com.yuanchu.mom.service.ProductEnumService;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.pojo.Enums;
+import com.yuanchu.mom.service.EnumService;
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.util.DigestUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
@@ -24,71 +23,45 @@
@AllArgsConstructor
public class EnumController {
- private CustomEnumService customEnumService;
+ private EnumService enumService;
- private ProductEnumService productEnumService;
-
- @ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃")
- @PostMapping("/selectCustomEnumLists")
- public Result selectCustomEnumLists(@RequestBody Map<String, Object> data) throws Exception {
+ @ValueClassify("鏁版嵁瀛楀吀")
+ @ApiOperation(value = "鑾峰彇鏋氫妇鍒楄〃")
+ @PostMapping("/selectEnumList")
+ public Result selectEnumList(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- CustomEnum customEnum = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CustomEnum.class);
- return Result.success(customEnumService.selectCustomEnumList(page, customEnum));
+ Enums enums = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Enums.class);
+ return Result.success(enumService.selectEnumList(page, enums));
+ }
+ @ValueClassify("鏁版嵁瀛楀吀")
+ @ApiOperation(value = "娣诲姞鏋氫妇")
+ @PostMapping("/addEnum")
+ public Result addEnum(@RequestBody Enums enums) {
+ return Result.success(enumService.addEnum(enums));
+ }
+ @ValueClassify("鏁版嵁瀛楀吀")
+ @ApiOperation(value = "淇敼鏋氫妇")
+ @PostMapping("/upEnum")
+ public Result<?> upEnum(@RequestBody Enums enums) {
+ return Result.success(enumService.upEnum(enums));
+ }
+ @ValueClassify("鏁版嵁瀛楀吀")
+ @ApiOperation(value = "鍒犻櫎鏋氫妇")
+ @PostMapping("/delEnum")
+ public Result<?> delEnum(Integer id) {
+ return Result.success(enumService.delEnum(id));
}
- @ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃鏋氫妇")
- @GetMapping("/selectCustomEnumList")
- public Result selectCustomEnumList(){
- return Result.success(customEnumService.selectList());
+ @ApiOperation(value = "閫氳繃鍒嗙被鏌ヨ鏋氫妇")
+ @PostMapping("/selectEnumByCategory")
+ @ValueAuth
+ public Result<?> selectEnumByCategory(String category){
+ return Result.success(enumService.selectEnumByCategory(category));
}
-
- @ApiOperation(value = "鍒犻櫎瀹㈡埛鍒楄〃")
- @PostMapping("/delCustomEnum")
- public Result delCustomEnum(Integer id){
- return Result.success(customEnumService.delCustomEnum(id));
+ @ValueAuth
+ @ApiOperation(value = "鑾峰彇鏁版嵁瀛楀吀鐨勫垎绫�")
+ @PostMapping("/getDic")
+ public Result<?> getDic(){
+ return Result.success(enumService.getDic());
}
-
- @ApiOperation(value = "淇敼瀹㈡埛淇℃伅")
- @PostMapping("/updateCustomEnum")
- public Result<?> updateCustomEnum(@RequestBody CustomEnum customEnum) {
- return Result.success(customEnumService.updateCustomEnum(customEnum));
- }
-
- @ApiOperation(value = "娣诲姞瀹㈡埛淇℃伅")
- @PostMapping("/addCustomEnum")
- public Result<?> addCustomEnum(@RequestBody CustomEnum customEnum) {
- return Result.success(customEnumService.addCustomEnum(customEnum));
- }
-
- @ApiOperation(value = "鑾峰彇椤圭洰鍒楄〃")
- @PostMapping("/selectProductEnumLists")
- public Result selectProductEnumLists(@RequestBody Map<String, Object> data) {
- Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
- ProductEnum productEnum = JSON.parseObject(JSON.toJSONString(data.get("entity")), ProductEnum.class);
- return Result.success(productEnumService.selectProductEnumList(page, productEnum));
- }
-
- @ApiOperation(value = "鑾峰彇椤圭洰鍒楄〃鏋氫妇")
- @GetMapping("/selectProductEnumList")
- public Result selectProductEnumList(){
- return Result.success(productEnumService.selectList());
- }
-
- @ApiOperation(value = "鍒犻櫎椤圭洰鍒楄〃")
- @PostMapping("/delProductEnum")
- public Result delProductEnum(Integer id){
- return Result.success(productEnumService.delProductEnum(id));
- }
-
- @ApiOperation(value = "淇敼椤圭洰淇℃伅")
- @PostMapping("/updateProductEnum")
- public Result<?> updateProductEnum(@RequestBody ProductEnum productEnum) {
- return Result.success(productEnumService.updateProductEnum(productEnum));
- }
-
- @ApiOperation(value = "娣诲姞椤圭洰淇℃伅")
- @PostMapping("/addProductEnum")
- public Result<?> addProductEnum(@RequestBody ProductEnum productEnum) {
- return Result.success(productEnumService.addProductEnum(productEnum));
- }
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3