20211220添加角色和成员相关接口

pom.xml

@@ -28,7 +28,7 @@
             <groupId>com.ccsens</groupId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <!--cloud 工具类-->
+        <!--公用接口-->
         <dependency>
             <artifactId>common</artifactId>
             <groupId>com.ccsens</groupId>

src/main/java/com/ccsens/ccbasics/api/MemberController.java

@@ -0,0 +1,92 @@
+package com.ccsens.ccbasics.api;
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.common.bean.dto.CMemberDto;
+import com.ccsens.common.bean.vo.CMemberVo;
+import com.ccsens.common.service.MemberService;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+@Api(tags = "角色相关" , description = "DebugController | ")
+@RestController
+@RequestMapping("/member")
+@Slf4j
+public class MemberController {
+    @Resource
+    private MemberService memberService;
+
+    @MustLogin
+    @ApiOperation(value = "查找项目下的成员", notes = "")
+    @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<CMemberVo.MemberInfo>> queryByProjectId(@ApiParam @Validated @RequestBody QueryDto<CMemberDto.QueryMemberByProject> params) {
+        log.info("查找项目下的成员：{}",params);
+        List<CMemberVo.MemberInfo> memberInfoList = memberService.queryByProject(params.getParam(), params.getUserId());
+        log.info("项目下的成员列表：{}",memberInfoList);
+        return JsonResponse.newInstance().ok(memberInfoList);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "根据id查找成员", notes = "")
+    @RequestMapping(value = "/getById", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<CMemberVo.MemberInfo>> getMemberById(@ApiParam @Validated @RequestBody QueryDto<CMemberDto.GetMember> params) {
+        log.info("根据id查找成员：{}",params);
+        CMemberVo.MemberInfo memberInfo = memberService.getMemberById(params.getParam(), params.getUserId());
+        log.info("根据id查找成员信息：{}",memberInfo);
+        return JsonResponse.newInstance().ok(memberInfo);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "添加成员", notes = "")
+    @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse saveMember(@ApiParam @Validated @RequestBody QueryDto<CMemberDto.SaveMemberInfo> params) {
+        log.info("添加成员：{}",params);
+        memberService.saveMember(params.getParam(), params.getUserId());
+        log.info("添加成员成功");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @ApiOperation(value = "修改成员信息", notes = "")
+    @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse updateMember(@ApiParam @Validated @RequestBody QueryDto<CMemberDto.UpdateMemberInfo> params) {
+        log.info("修改成员信息：{}",params);
+        memberService.updateMember(params.getParam(), params.getUserId());
+        log.info("修改成员信息成功");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @ApiOperation(value = "删除成员信息", notes = "")
+    @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse delMember(@ApiParam @Validated @RequestBody QueryDto<CMemberDto.GetMember> params) {
+        log.info("删除成员信息：{}",params);
+        memberService.deleteMember(params.getParam(), params.getUserId());
+        log.info("删除成员信息成功");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @ApiOperation(value = "修改成员所属的角色", notes = "")
+    @RequestMapping(value = "/memberRoles", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse updateMemberRoles(@ApiParam @Validated @RequestBody QueryDto<CMemberDto.UpdateMemberRoles> params) {
+        log.info("修改成员所属的角色：{}",params);
+        memberService.updateMemberRoles(params.getParam(), params.getUserId());
+        log.info("修改成员所属的角色成功");
+        return JsonResponse.newInstance().ok();
+    }
+}

src/main/java/com/ccsens/ccbasics/api/RoleController.java

@@ -56,4 +56,44 @@ public class RoleController {
         return JsonResponse.newInstance().ok(member);
     }
 
+    @MustLogin
+    @ApiOperation(value = "添加角色", notes = "")
+    @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse saveRole(@ApiParam @Validated @RequestBody QueryDto<CRoleDto.SaveRole> params) {
+        log.info("添加角色{}",params);
+        roleService.saveRole(params.getParam(),params.getUserId());
+        log.info("添加角色成功");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @ApiOperation(value = "修改角色信息", notes = "")
+    @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse updateRole(@ApiParam @Validated @RequestBody QueryDto<CRoleDto.UpdateRole> params) {
+        log.info("修改角色信息{}",params);
+        roleService.updateRole(params.getParam(),params.getUserId());
+        log.info("修改角色信息成功");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @ApiOperation(value = "删除角色", notes = "")
+    @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse deleteRole(@ApiParam @Validated @RequestBody QueryDto<CRoleDto.QueryMemberOfRole> params) {
+        log.info("删除角色{}",params);
+        roleService.delRole(params.getParam(),params.getUserId());
+        log.info("删除角色成功");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @ApiOperation(value = "修改角色下的成员", notes = "")
+    @RequestMapping(value = "/roleMembers", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse updateRoleMembers(@ApiParam @Validated @RequestBody QueryDto<CRoleDto.UpdateRoleMembers> params) {
+        log.info("修改角色下的成员{}",params);
+        roleService.updateRoleMembers(params.getParam(),params.getUserId());
+        log.info("修改角色下的成员成功");
+        return JsonResponse.newInstance().ok();
+    }
+
 }

src/main/java/com/ccsens/ccbasics/api/TaskController.java

@@ -1,7 +1,9 @@
 package com.ccsens.ccbasics.api;
 
 import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.common.bean.dto.CPluginDto;
 import com.ccsens.common.bean.dto.CTaskDto;
+import com.ccsens.common.bean.vo.CPluginVo;
 import com.ccsens.common.bean.vo.CTaskVo;
 import com.ccsens.common.service.ITaskService;
 import com.ccsens.util.JsonResponse;
@@ -88,4 +90,40 @@ public class TaskController {
         log.info("查找项目下的任务结束{}",taskList);
         return JsonResponse.newInstance().ok(taskList);
     }
+
+    @ApiOperation(value = "修改任务信息", notes = "")
+    @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse updateTask(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.UpdateTask> params) throws Exception {
+        log.info("修改任务信息开始{}",params);
+        taskService.updateTaskDetail(params.getParam(), params.getUserId());
+        log.info("修改任务信息结束");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @ApiOperation(value = "删除任务", notes = "")
+    @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse deleteTask(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.FindSonTask> params) throws Exception {
+        log.info("删除任务开始{}",params);
+        taskService.deleteTaskDetail(params.getParam(), params.getUserId());
+        log.info("删除任务结束");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @ApiOperation(value = "查找任务下的插件列表", notes = "")
+    @RequestMapping(value = "/queryTaskPlugin", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<CPluginVo.TaskPlugin>> queryTaskPlugin(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.FindSonTask> params) throws Exception {
+        log.info("查找任务下的插件列表开始{}",params);
+        List<CPluginVo.TaskPlugin> taskPlugins = taskService.queryPluginByTaskId(params.getParam(), params.getUserId());
+        log.info("查找任务下的插件列表结束:{}",taskPlugins);
+        return JsonResponse.newInstance().ok(taskPlugins);
+    }
+
+    @ApiOperation(value = "给任务添加关联插件", notes = "")
+    @RequestMapping(value = "/saveTaskPlugin", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse saveTaskPlugin(@ApiParam @Validated @RequestBody QueryDto<CPluginDto.SaveTaskPlugin> params) throws Exception {
+        log.info("给任务添加关联插件{}",params);
+        taskService.saveTaskPlugin(params.getParam(), params.getUserId());
+        log.info("给任务添加关联插件结束");
+        return JsonResponse.newInstance().ok();
+    }
 }

src/main/resources/druid-dev.yml

@@ -28,7 +28,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://49.233.89.188:3306/ccbasics?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://49.233.89.188:3306/ccbasics?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
 #      env: CCSENS_GAME

src/main/resources/druid-test.yml

@@ -27,7 +27,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://test.tall.wiki/defaultwbs?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://test.tall.wiki/defaultwbs?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_TALL