From 08cad817f057c4a10e1ea59e362fbb492f3381df Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 22 五月 2024 16:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java b/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
index 73bb8e9..08729b4 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
@@ -1,37 +1,48 @@
package com.yuanchu.mom.controller;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpResponse;
-import cn.hutool.http.HttpUtil;
import com.yuanchu.mom.annotation.ValueAuth;
-import com.yuanchu.mom.pojo.AuthApi;
+import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.dto.PersonDto;
import com.yuanchu.mom.pojo.Company;
+import com.yuanchu.mom.service.UserService;
import com.yuanchu.mom.util.HeaderToken;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Authorization;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@AllArgsConstructor
@RequestMapping("/companies")
-@Api("缁勭粐妯″潡")
+@Api(tags="鐢ㄦ埛妯″潡")
public class CompaniesController {
- @Autowired
private HeaderToken headerToken;
- @ValueAuth
- @ApiOperation(value = "鑾峰彇缁勭粐鍒楄〃")
+ private UserService userService;
+
+ @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ApiOperation(value = "鑾峰彇浜轰簨绯荤粺缁勭粐鏋舵瀯")
@GetMapping(value = "/selectCompaniesList")
- public Result<List<Company>> selectcompaniesList(){
+ public Result<List<Company>> selectCompaniesList() {
return Result.success(headerToken.companyUrl());
}
+
+ @ValueAuth
+ @ApiOperation("鑾峰彇浜轰簨绯荤粺缁勭粐涓嬬殑浜哄憳")
+ @PostMapping(value = "/selectSimpleList")
+ public Result<?> selectSimpleList(String companyId) {
+ return Result.success(headerToken.userUrl(companyId));
+ }
+
+ @ValueAuth
+ @ApiOperation("灏嗕汉浜嬬郴缁熷嬀閫夌殑鍐呭杞Щ鍒版湰绯荤粺")
+ @PostMapping(value = "/addPersonUser")
+ public Result<?> addPersonUser(@RequestBody PersonDto personDto) {
+ return Result.success(userService.addPersonUser(personDto));
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3