|
@@ -1,6 +1,5 @@
|
|
package org.jeecg.modules.ctop.controller;
|
|
package org.jeecg.modules.ctop.controller;
|
|
|
|
|
|
-import cn.com.ctop.common.module.annotation.AutoLog;
|
|
|
|
import cn.com.ctop.common.module.entity.Project;
|
|
import cn.com.ctop.common.module.entity.Project;
|
|
import cn.com.ctop.common.module.service.IProjectService;
|
|
import cn.com.ctop.common.module.service.IProjectService;
|
|
import cn.com.ctop.common.module.service.ISysRoleService;
|
|
import cn.com.ctop.common.module.service.ISysRoleService;
|
|
@@ -11,7 +10,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
-import io.swagger.annotations.ApiOperation;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.shiro.SecurityUtils;
|
|
import org.apache.shiro.SecurityUtils;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
@@ -58,8 +56,6 @@ public class ProjectMemberController {
|
|
* @param projectId
|
|
* @param projectId
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @AutoLog(value = "项目成员-分页列表查询")
|
|
|
|
- @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
|
|
|
|
@GetMapping(value = "/getMemberList")
|
|
@GetMapping(value = "/getMemberList")
|
|
public Map<String, Object> getMemberList(String projectId) {
|
|
public Map<String, Object> getMemberList(String projectId) {
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
@@ -86,8 +82,6 @@ public class ProjectMemberController {
|
|
* @param userId
|
|
* @param userId
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @AutoLog(value = "项目成员-分页列表查询")
|
|
|
|
- @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
|
|
|
|
@GetMapping(value = "/participateList")
|
|
@GetMapping(value = "/participateList")
|
|
public Map<String, Object> participateList(String userId) {
|
|
public Map<String, Object> participateList(String userId) {
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
@@ -140,8 +134,6 @@ public class ProjectMemberController {
|
|
* @param req
|
|
* @param req
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @AutoLog(value = "项目成员-分页列表查询")
|
|
|
|
- @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
|
|
|
|
@GetMapping(value = "/list")
|
|
@GetMapping(value = "/list")
|
|
public Result<IPage<ProjectMember>> queryPageList(ProjectMember projectMember,
|
|
public Result<IPage<ProjectMember>> queryPageList(ProjectMember projectMember,
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
@@ -163,10 +155,6 @@ public class ProjectMemberController {
|
|
* @param jsonObject
|
|
* @param jsonObject
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
-
|
|
|
|
-
|
|
|
|
- @AutoLog(value = "项目成员-添加")
|
|
|
|
- @ApiOperation(value = "项目成员-添加", notes = "项目成员-添加")
|
|
|
|
@PostMapping(value = "/batchAdd")
|
|
@PostMapping(value = "/batchAdd")
|
|
public Result<ProjectMember> batchAdd(@RequestBody JSONObject jsonObject) {
|
|
public Result<ProjectMember> batchAdd(@RequestBody JSONObject jsonObject) {
|
|
Result<ProjectMember> result = new Result<>();
|
|
Result<ProjectMember> result = new Result<>();
|
|
@@ -221,8 +209,6 @@ public class ProjectMemberController {
|
|
* @param projectMember
|
|
* @param projectMember
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @AutoLog(value = "项目成员-添加")
|
|
|
|
- @ApiOperation(value = "项目成员-添加", notes = "项目成员-添加")
|
|
|
|
@PostMapping(value = "/add")
|
|
@PostMapping(value = "/add")
|
|
public Result<ProjectMember> add(@RequestBody ProjectMember projectMember) {
|
|
public Result<ProjectMember> add(@RequestBody ProjectMember projectMember) {
|
|
Result<ProjectMember> result = new Result<>();
|
|
Result<ProjectMember> result = new Result<>();
|
|
@@ -242,8 +228,6 @@ public class ProjectMemberController {
|
|
* @param projectMember
|
|
* @param projectMember
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @AutoLog(value = "项目成员-编辑")
|
|
|
|
- @ApiOperation(value = "项目成员-编辑", notes = "项目成员-编辑")
|
|
|
|
@PutMapping(value = "/edit")
|
|
@PutMapping(value = "/edit")
|
|
public Result<ProjectMember> edit(@RequestBody ProjectMember projectMember) {
|
|
public Result<ProjectMember> edit(@RequestBody ProjectMember projectMember) {
|
|
Result<ProjectMember> result = new Result<>();
|
|
Result<ProjectMember> result = new Result<>();
|
|
@@ -266,8 +250,6 @@ public class ProjectMemberController {
|
|
* @param id
|
|
* @param id
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @AutoLog(value = "项目成员-通过id删除")
|
|
|
|
- @ApiOperation(value = "项目成员-通过id删除", notes = "项目成员-通过id删除")
|
|
|
|
@DeleteMapping(value = "/delete")
|
|
@DeleteMapping(value = "/delete")
|
|
public Result<Object> delete(@RequestParam(name = "id", required = true) String id) {
|
|
public Result<Object> delete(@RequestParam(name = "id", required = true) String id) {
|
|
try {
|
|
try {
|
|
@@ -285,8 +267,6 @@ public class ProjectMemberController {
|
|
* @param ids
|
|
* @param ids
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @AutoLog(value = "项目成员-批量删除")
|
|
|
|
- @ApiOperation(value = "项目成员-批量删除", notes = "项目成员-批量删除")
|
|
|
|
@DeleteMapping(value = "/deleteBatch")
|
|
@DeleteMapping(value = "/deleteBatch")
|
|
public Result<ProjectMember> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
|
public Result<ProjectMember> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
|
Result<ProjectMember> result = new Result<>();
|
|
Result<ProjectMember> result = new Result<>();
|
|
@@ -305,8 +285,6 @@ public class ProjectMemberController {
|
|
* @param id
|
|
* @param id
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @AutoLog(value = "项目成员-通过id查询")
|
|
|
|
- @ApiOperation(value = "项目成员-通过id查询", notes = "项目成员-通过id查询")
|
|
|
|
@GetMapping(value = "/queryById")
|
|
@GetMapping(value = "/queryById")
|
|
public Result<ProjectMember> queryById(@RequestParam(name = "id", required = true) String id) {
|
|
public Result<ProjectMember> queryById(@RequestParam(name = "id", required = true) String id) {
|
|
Result<ProjectMember> result = new Result<>();
|
|
Result<ProjectMember> result = new Result<>();
|
|
@@ -325,8 +303,6 @@ public class ProjectMemberController {
|
|
*
|
|
*
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @AutoLog(value = "头条视频报表-参与项目列表")
|
|
|
|
- @ApiOperation(value = "头条视频报表-参与项目列表", notes = "头条视频报表-参与项目列表")
|
|
|
|
@GetMapping(value = "/bytedanceProjectParticipateInList")
|
|
@GetMapping(value = "/bytedanceProjectParticipateInList")
|
|
public Result<List<ProjectMember>> bytedanceProjectParticipateInList() {
|
|
public Result<List<ProjectMember>> bytedanceProjectParticipateInList() {
|
|
Result<List<ProjectMember>> result = new Result<>();
|
|
Result<List<ProjectMember>> result = new Result<>();
|