燕园初建

src/main/java/com/ccsens/yanyuan/api/PluginController.java

@@ -29,11 +29,11 @@ public class PluginController {
     @Resource
     private IPluginService pluginService;
 
-    @MustLogin
+//    @MustLogin
-    @ApiOperation(value = "给任务添加插件", notes = "")
+//    @ApiOperation(value = "给任务添加插件", notes = "")
-    @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+//    @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse queryPatientList(@ApiParam @Validated @RequestBody QueryDto<List<CPluginDto.UpdateTaskPlugin>> params) throws Exception{
+//    public JsonResponse queryPatientList(@ApiParam @Validated @RequestBody QueryDto<List<CPluginDto.UpdateTaskPlugin>> params) throws Exception{
-        pluginService.updateTaskPlugin(params.getParam());
+//        pluginService.updateTaskPlugin(params.getParam());
-        return JsonResponse.newInstance().ok();
+//        return JsonResponse.newInstance().ok();
-    }
+//    }
 }

src/main/java/com/ccsens/yanyuan/api/PowerController.java

@@ -28,11 +28,11 @@ public class PowerController {
     private IPowerService powerService;
 
 
-    @ApiOperation(value = "查询用户在项目中的权限", notes = "")
+//    @ApiOperation(value = "查询用户在项目中的权限", notes = "")
-    @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+//    @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<Integer> queryPatientList(@ApiParam @Validated @RequestBody CProjectDto.QueryPower params) throws Exception{
+//    public JsonResponse<Integer> queryPatientList(@ApiParam @Validated @RequestBody CProjectDto.QueryPower params) throws Exception{
-        Integer power = powerService.queryUserPower(params.getProjectId(), params.getUserId());
+//        Integer power = powerService.queryUserPower(params.getProjectId(), params.getUserId());
-        return JsonResponse.newInstance().ok(power);
+//        return JsonResponse.newInstance().ok(power);
-    }
+//    }
 
 }

src/main/java/com/ccsens/yanyuan/api/ProjectController.java

@@ -5,6 +5,8 @@ import com.ccsens.common.bean.vo.CProjectVo;
 import com.ccsens.common.service.IProjectService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;
+import com.ccsens.yanyuan.bean.dto.ProjectDto;
+import com.ccsens.yanyuan.bean.vo.ProjectVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -32,35 +34,35 @@ public class ProjectController {
 
     @ApiOperation(value = "根据id查询项目信息", notes = "根据id查询项目信息")
     @RequestMapping(value = "/findProjectById", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<CProjectVo.ProjectInfo> findProjectById(@ApiParam @Validated @RequestBody QueryDto<CProjectDto.ProjectById> params) throws Exception{
+    public JsonResponse<ProjectVo.ProjectInformation> findProjectById(@ApiParam @Validated @RequestBody QueryDto<ProjectDto.ProjectById> params) throws Exception{
         CProjectVo.ProjectInfo projectById = projectService.findProjectById(params.getParam(), params.getUserId());
         return JsonResponse.newInstance().ok(projectById);
     }
 
-    @ApiOperation(value = "查询子项目", notes = "查询子项目")
+//    @ApiOperation(value = "查询子项目", notes = "查询子项目")
-    @RequestMapping(value = "/findSonProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+//    @RequestMapping(value = "/findSonProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<CProjectVo.ProjectInfo>> findSonProject(@ApiParam @Validated @RequestBody QueryDto<CProjectDto.FindSonProject> params) throws Exception{
+//    public JsonResponse<List<CProjectVo.ProjectInfo>> findSonProject(@ApiParam @Validated @RequestBody QueryDto<CProjectDto.FindSonProject> params) throws Exception{
-        log.info("查询子项目开始");
+//        log.info("查询子项目开始");
-        List<CProjectVo.ProjectInfo> projectInfoList = projectService.findSonProject(params.getParam(), params.getUserId());
+//        List<CProjectVo.ProjectInfo> projectInfoList = projectService.findSonProject(params.getParam(), params.getUserId());
-        log.info("查询子项目结束{}",projectInfoList);
+//        log.info("查询子项目结束{}",projectInfoList);
-        return JsonResponse.newInstance().ok(projectInfoList);
+//        return JsonResponse.newInstance().ok(projectInfoList);
-    }
+//    }
-
+//
-
+//
-    @ApiOperation(value = "删除项目", notes = "删除项目")
+//    @ApiOperation(value = "删除项目", notes = "删除项目")
-    @RequestMapping(value = "/deleteProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+//    @RequestMapping(value = "/deleteProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse deleteProject(@ApiParam @Validated @RequestBody QueryDto<CProjectDto.ProjectById> params) throws Exception{
+//    public JsonResponse deleteProject(@ApiParam @Validated @RequestBody QueryDto<CProjectDto.ProjectById> params) throws Exception{
-        log.info("删除项目开始");
+//        log.info("删除项目开始");
-        projectService.deleteProjectById(params.getParam(), params.getUserId());
+//        projectService.deleteProjectById(params.getParam(), params.getUserId());
-        log.info("删除项目结束");
+//        log.info("删除项目结束");
-        return JsonResponse.newInstance().ok();
+//        return JsonResponse.newInstance().ok();
-    }
+//    }
-
+//
-    @RequestMapping(value = "/tallDelProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+//    @RequestMapping(value = "/tallDelProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse deleteProject(@ApiParam @Validated @RequestBody CProjectDto.ProjectById params) throws Exception{
+//    public JsonResponse deleteProject(@ApiParam @Validated @RequestBody CProjectDto.ProjectById params) throws Exception{
-        log.info("删除项目开始");
+//        log.info("删除项目开始");
-        projectService.deleteProjectById(params,null);
+//        projectService.deleteProjectById(params,null);
-        log.info("删除项目结束");
+//        log.info("删除项目结束");
-        return JsonResponse.newInstance().ok();
+//        return JsonResponse.newInstance().ok();
-    }
+//    }
 }

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

@@ -6,6 +6,9 @@ import com.ccsens.common.bean.vo.CRoleVo;
 import com.ccsens.common.service.IProRoleService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;
+import com.ccsens.yanyuan.bean.dto.RoleDto;
+import com.ccsens.yanyuan.bean.vo.RoleVo;
+import com.ccsens.yanyuan.service.IYRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -27,33 +30,36 @@ import java.util.List;
 @RequestMapping("/role")
 @Slf4j
 public class RoleController {
+//    @Resource
+//    private IProRoleService roleService;
     @Resource
-    private IProRoleService roleService;
+    private IYRoleService yRoleService;
 
     @MustLogin
     @ApiOperation(value = "根据项目id查找角色", notes = "")
     @RequestMapping(value = "/show", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-        public JsonResponse<CRoleVo.QueryRole> queryByProjectId(@ApiParam @Validated @RequestBody QueryDto<CRoleDto.QueryRoleById> params) {
+        public JsonResponse<RoleVo.QueryRole> queryByProjectId(@ApiParam @Validated @RequestBody QueryDto<RoleDto.QueryRoleById> params) {
-        CRoleVo.QueryRole queryRole = roleService.queryShowRole(params.getParam(), params.getUserId());
+//        CRoleVo.QueryRole queryRole = roleService.queryShowRole(params.getParam(), params.getUserId());
+        CRoleVo.QueryRole queryRole = yRoleService.queryShowRole(params.getParam(), params.getUserId());
         return JsonResponse.newInstance().ok(queryRole);
     }
 
-    @MustLogin
+//    @MustLogin
-    @ApiOperation(value = "修改角色展示", notes = "")
+//    @ApiOperation(value = "修改角色展示", notes = "")
-    @RequestMapping(value = "/updateShow", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+//    @RequestMapping(value = "/updateShow", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse updateShow(@ApiParam @Validated @RequestBody QueryDto<CRoleDto.UpdateRoleShow> params) {
+//    public JsonResponse updateShow(@ApiParam @Validated @RequestBody QueryDto<CRoleDto.UpdateRoleShow> params) {
-        roleService.updateShowRole(params.getParam(),params.getUserId());
+//        roleService.updateShowRole(params.getParam(),params.getUserId());
-        return JsonResponse.newInstance().ok();
+//        return JsonResponse.newInstance().ok();
-    }
+//    }
-
+//
-    @MustLogin
+//    @MustLogin
-    @ApiOperation(value = "查询角色下的所有成员", notes = "")
+//    @ApiOperation(value = "查询角色下的所有成员", notes = "")
-    @RequestMapping(value = "/queryMemberOfRole", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+//    @RequestMapping(value = "/queryMemberOfRole", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<CRoleVo.MemberOfRoleInfo>> queryMemberOfRole(@ApiParam @Validated @RequestBody QueryDto<CRoleDto.QueryMemberOfRole> params) {
+//    public JsonResponse<List<CRoleVo.MemberOfRoleInfo>> queryMemberOfRole(@ApiParam @Validated @RequestBody QueryDto<CRoleDto.QueryMemberOfRole> params) {
-        log.info("查询角色下的所有成员开始{}",params);
+//        log.info("查询角色下的所有成员开始{}",params);
-        List<CRoleVo.MemberOfRoleInfo> member = roleService.queryMemberOfRole(params.getParam(),params.getUserId());
+//        List<CRoleVo.MemberOfRoleInfo> member = roleService.queryMemberOfRole(params.getParam(),params.getUserId());
-        log.info("查询角色下的所有成员开始{}",params);
+//        log.info("查询角色下的所有成员开始{}",params);
-        return JsonResponse.newInstance().ok(member);
+//        return JsonResponse.newInstance().ok(member);
-    }
+//    }
 
 }

src/main/java/com/ccsens/yanyuan/api/ShareController.java

@@ -30,19 +30,19 @@ public class ShareController {
     @Resource
     private IShareService shareService;
 
-    @MustLogin
+//    @MustLogin
-    @ApiOperation(value = "创建分享连接", notes = "")
+//    @ApiOperation(value = "创建分享连接", notes = "")
-    @RequestMapping(value = "/create", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+//    @RequestMapping(value = "/create", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<CShareVo.CreateShareUrl> createShareUrl(@ApiParam @Validated @RequestBody QueryDto<CShareDto.CreateShareUrl> params) {
+//    public JsonResponse<CShareVo.CreateShareUrl> createShareUrl(@ApiParam @Validated @RequestBody QueryDto<CShareDto.CreateShareUrl> params) {
-        CShareVo.CreateShareUrl shareUrl = shareService.createShareUrl(params.getParam(), params.getUserId());
+//        CShareVo.CreateShareUrl shareUrl = shareService.createShareUrl(params.getParam(), params.getUserId());
-        return JsonResponse.newInstance().ok(shareUrl);
+//        return JsonResponse.newInstance().ok(shareUrl);
-    }
+//    }
-
+//
-    @MustLogin
+//    @MustLogin
-    @ApiOperation(value = "点击分享连接", notes = "")
+//    @ApiOperation(value = "点击分享连接", notes = "")
-    @RequestMapping(value = "/click", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+//    @RequestMapping(value = "/click", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<CShareVo.ClickShareInfo> queryByProjectId(@ApiParam @Validated @RequestBody QueryDto<CShareDto.ClickShareUrl> params) {
+//    public JsonResponse<CShareVo.ClickShareInfo> queryByProjectId(@ApiParam @Validated @RequestBody QueryDto<CShareDto.ClickShareUrl> params) {
-        CShareVo.ClickShareInfo clickShareInfo = shareService.clickShareUrl(params.getParam(), params.getUserId(),params.getUserName(),params.getPhone());
+//        CShareVo.ClickShareInfo clickShareInfo = shareService.clickShareUrl(params.getParam(), params.getUserId(),params.getUserName(),params.getPhone());
-        return JsonResponse.newInstance().ok(clickShareInfo);
+//        return JsonResponse.newInstance().ok(clickShareInfo);
-    }
+//    }
 }

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

@@ -6,6 +6,9 @@ import com.ccsens.common.bean.vo.CTaskVo;
 import com.ccsens.common.service.ITaskService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;
+import com.ccsens.yanyuan.bean.dto.TaskDto;
+import com.ccsens.yanyuan.bean.vo.TaskVo;
+import com.ccsens.yanyuan.service.IYTaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -29,19 +32,22 @@ import java.util.List;
 public class TaskController {
     @Resource
     private ITaskService taskService;
+    @Resource
+    private IYTaskService yTaskService;
 
     @MustLogin
     @ApiOperation(value = "查找永久日常任务", notes = "")
     @RequestMapping(value = "/permanent", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<CTaskVo.QueryTask>> queryPermanentGlobalTask(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.QueryPermanentGlobalTask> params) {
+    public JsonResponse<List<TaskVo.QueryTask>> queryPermanentGlobalTask(@ApiParam @Validated @RequestBody QueryDto<TaskDto.QueryPermanentGlobalTask> params) {
-        List<CTaskVo.QueryTask> queryTasks = taskService.queryPermanentGlobalTask(params.getParam(), params.getUserId());
+        List<TaskVo.QueryTask> queryTasks = yTaskService.queryPermanentGlobalTask(params.getParam(), params.getUserId());
+//        List<CTaskVo.QueryTask> queryTasks = taskService.queryPermanentGlobalTask(params.getParam(), params.getUserId());
         return JsonResponse.newInstance().ok(queryTasks);
     }
 
     @MustLogin
     @ApiOperation(value = "查找带时间的日常任务", notes = "")
     @RequestMapping(value = "/global", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<CTaskVo.QueryTask>> queryGlobalTask(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.QueryGlobalTask> params) {
+    public JsonResponse<List<TaskVo.QueryTask>> queryGlobalTask(@ApiParam @Validated @RequestBody QueryDto<TaskDto.QueryGlobalTask> params) {
         List<CTaskVo.QueryTask> queryTasks = taskService.queryGlobalTask(params.getParam(), params.getUserId());
         return JsonResponse.newInstance().ok(queryTasks);
     }
@@ -49,43 +55,44 @@ public class TaskController {
     @MustLogin
     @ApiOperation(value = "查找定期任务", notes = "")
     @RequestMapping(value = "/regular", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<CTaskVo.QueryTask>> queryRegularTask(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.QueryRegularTask> params) {
+    public JsonResponse<List<TaskVo.QueryTask>> queryRegularTask(@ApiParam @Validated @RequestBody QueryDto<TaskDto.QueryRegularTask> params) {
-        List<CTaskVo.QueryTask> queryTasks = taskService.queryRegularTask(params.getParam(), params.getUserId());
+//        List<CTaskVo.QueryTask> queryTasks = taskService.queryRegularTask(params.getParam(), params.getUserId());
+        List<TaskVo.QueryTask> queryTasks = yTaskService.queryRegularTask(params.getParam(), params.getUserId());
         return JsonResponse.newInstance().ok(queryTasks);
     }
 
     @MustLogin
     @ApiOperation(value = "修改任务状态", notes = "")
     @RequestMapping(value = "/type", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse updateTaskType(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.UpdateTaskType> params) throws Exception {
+    public JsonResponse updateTaskType(@ApiParam @Validated @RequestBody QueryDto<TaskDto.UpdateTaskType> params) throws Exception {
         taskService.updateTaskType(params.getParam(),params.getUserId());
         return JsonResponse.newInstance().ok();
     }
 
-    @ApiOperation(value = "查询子任务", notes = "")
+//    @ApiOperation(value = "查询子任务", notes = "")
-    @RequestMapping(value = "/findSonTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+//    @RequestMapping(value = "/findSonTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<CTaskVo.SonTaskDetail>> findSonTask(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.FindSonTask> params) throws Exception {
+//    public JsonResponse<List<CTaskVo.SonTaskDetail>> findSonTask(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.FindSonTask> params) throws Exception {
-        log.info("查询子任务开始");
+//        log.info("查询子任务开始");
-        List<CTaskVo.SonTaskDetail> sonTask = taskService.findSonTask(params.getParam(), params.getUserId());
+//        List<CTaskVo.SonTaskDetail> sonTask = taskService.findSonTask(params.getParam(), params.getUserId());
-        log.info("查询子任务开始{}",sonTask);
+//        log.info("查询子任务开始{}",sonTask);
-        return JsonResponse.newInstance().ok(sonTask);
+//        return JsonResponse.newInstance().ok(sonTask);
-    }
+//    }
-
+//
-    @ApiOperation(value = "添加任务", notes = "")
+//    @ApiOperation(value = "添加任务", notes = "")
-    @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+//    @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<CTaskVo.QueryTask>> saveTask(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.SaveTask> params) throws Exception {
+//    public JsonResponse<List<CTaskVo.QueryTask>> saveTask(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.SaveTask> params) throws Exception {
-        log.info("添加任务开始");
+//        log.info("添加任务开始");
-        List<CTaskVo.QueryTask> taskList = taskService.saveTask(params.getParam(), params.getUserId());
+//        List<CTaskVo.QueryTask> taskList = taskService.saveTask(params.getParam(), params.getUserId());
-        log.info("添加任务结束{}",taskList);
+//        log.info("添加任务结束{}",taskList);
-        return JsonResponse.newInstance().ok(taskList);
+//        return JsonResponse.newInstance().ok(taskList);
-    }
+//    }
-
+//
-    @ApiOperation(value = "查找项目下的任务", notes = "")
+//    @ApiOperation(value = "查找项目下的任务", notes = "")
-    @RequestMapping(value = "/queryTaskOfProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+//    @RequestMapping(value = "/queryTaskOfProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<CTaskVo.TaskOfProject>> queryTaskOfProject(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.QueryTaskOfProject> params) throws Exception {
+//    public JsonResponse<List<CTaskVo.TaskOfProject>> queryTaskOfProject(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.QueryTaskOfProject> params) throws Exception {
-        log.info("查找项目下的任务开始{}",params);
+//        log.info("查找项目下的任务开始{}",params);
-        List<CTaskVo.TaskOfProject> taskList = taskService.queryTaskOfProject(params.getParam(), params.getUserId());
+//        List<CTaskVo.TaskOfProject> taskList = taskService.queryTaskOfProject(params.getParam(), params.getUserId());
-        log.info("查找项目下的任务结束{}",taskList);
+//        log.info("查找项目下的任务结束{}",taskList);
-        return JsonResponse.newInstance().ok(taskList);
+//        return JsonResponse.newInstance().ok(taskList);
-    }
+//    }
 }

src/main/java/com/ccsens/yanyuan/api/WbsController.java

@@ -40,35 +40,35 @@ public class WbsController {
 
 
 
-    @MustLogin
+//    @MustLogin
-    @ApiOperation(value = "导入WBS",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx")
+//    @ApiOperation(value = "导入WBS",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx")
-    @ApiImplicitParams({
+//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "file", value = "WBS表", required = true, paramType = "form",dataType = "__file")
+////            @ApiImplicitParam(name = "file", value = "WBS表", required = true, paramType = "form",dataType = "__file")
-    })
+//    })
-    @RequestMapping(value = "", method = RequestMethod.POST)
+//    @RequestMapping(value = "", method = RequestMethod.POST)
-    public JsonResponse<ProjectVo.ProjectInfo> importWbs(QueryDto<MultipartFile> params, Long projectId) throws Exception {
+//    public JsonResponse<ProjectVo.ProjectInfo> importWbs(QueryDto<MultipartFile> params, Long projectId) throws Exception {
-
+//
-        MultipartFile f = params.getParam();
+//        MultipartFile f = params.getParam();
-        String ext = FileUtil.extName(f.getOriginalFilename());
+//        String ext = FileUtil.extName(f.getOriginalFilename());
-        if(StrUtil.isEmpty(ext) || !BasicsConstant.WbsExcel.WBS_FILE_FORMAT.contains(ext)){
+//        if(StrUtil.isEmpty(ext) || !BasicsConstant.WbsExcel.WBS_FILE_FORMAT.contains(ext)){
-            throw new BaseException(BasicsCodeError.FILE_FORMAT_ERROR);
+//            throw new BaseException(BasicsCodeError.FILE_FORMAT_ERROR);
-        }
+//        }
-        //文件路径
+//        //文件路径
-        String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator;
+//        String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator;
-        String extraPath = DateUtil.format(new Date(), "yyyyMMdd");
+//        String extraPath = DateUtil.format(new Date(), "yyyyMMdd");
-        String path = extraPath + File.separator + IdUtil.simpleUUID() + "." + ext;
+//        String path = extraPath + File.separator + IdUtil.simpleUUID() + "." + ext;
-        //转成file
+//        //转成file
-        File file = new File(dir + extraPath);
+//        File file = new File(dir + extraPath);
-        if (!file.exists()) {
+//        if (!file.exists()) {
-            file.mkdirs();
+//            file.mkdirs();
-        }
+//        }
-        String fullPath = dir + File.separator + path;
+//        String fullPath = dir + File.separator + path;
-        FileUtil.writeFromStream(f.getInputStream(), fullPath);
+//        FileUtil.writeFromStream(f.getInputStream(), fullPath);
-
+//
-        //导入数据库
+//        //导入数据库
-        ProjectVo.ProjectInfo projectInfo = importService.importWbs(fullPath,params.getUserId(),projectId);
+//        ProjectVo.ProjectInfo projectInfo = importService.importWbs(fullPath,params.getUserId(),projectId);
-
+//
-        return JsonResponse.newInstance().ok(projectInfo);
+//        return JsonResponse.newInstance().ok(projectInfo);
-    }
+//    }
 
 }

src/main/java/com/ccsens/yanyuan/bean/dto/ProjectDto.java

@@ -0,0 +1,19 @@
+package com.ccsens.yanyuan.bean.dto;
+
+import com.ccsens.common.bean.dto.CProjectDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+
+public class ProjectDto {
+    @Data
+    @ApiModel("根据id查询项目信息")
+    public static class ProjectById extends CProjectDto.ProjectById {
+        @ApiModelProperty("模板code")
+        private String templateCode  ;
+    }
+
+}

src/main/java/com/ccsens/yanyuan/bean/dto/RoleDto.java

@@ -1,5 +1,9 @@
 package com.ccsens.yanyuan.bean.dto;
 
+import com.ccsens.common.bean.dto.CProjectDto;
+import com.ccsens.common.bean.dto.CRoleDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -17,4 +21,11 @@ public class RoleDto {
             this.userId = userId;
         }
     }
+
+    @Data
+    @ApiModel("根据id查询角色")
+    public static class QueryRoleById extends CRoleDto.QueryRoleById {
+        @ApiModelProperty("模板code")
+        private String templateCode  ;
+    }
 }

src/main/java/com/ccsens/yanyuan/bean/dto/TaskDto.java

@@ -1,5 +1,9 @@
 package com.ccsens.yanyuan.bean.dto;
 
+import com.ccsens.common.bean.dto.CProjectDto;
+import com.ccsens.common.bean.dto.CTaskDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -26,4 +30,33 @@ public class TaskDto {
         public TaskPluginId() {
         }
     }
+
+    @Data
+    @ApiModel("查找永久日常任务")
+    public static class QueryPermanentGlobalTask extends CTaskDto.QueryPermanentGlobalTask {
+        @ApiModelProperty("模板code")
+        private String templateCode  ;
+    }
+
+    @Data
+    @ApiModel("查找带时间的日常任务")
+    public static class QueryGlobalTask extends CTaskDto.QueryGlobalTask {
+        @ApiModelProperty("模板code")
+        private String templateCode  ;
+    }
+
+    @Data
+    @ApiModel("查找定期任务")
+    public static class QueryRegularTask extends CTaskDto.QueryRegularTask {
+        @ApiModelProperty("模板code")
+        private String templateCode  ;
+    }
+
+    @Data
+    @ApiModel("修改任务状态")
+    public static class UpdateTaskType extends CTaskDto.UpdateTaskType {
+        @ApiModelProperty("模板code")
+        private String templateCode  ;
+    }
+
 }

src/main/java/com/ccsens/yanyuan/bean/vo/ProjectVo.java

@@ -1,6 +1,7 @@
 package com.ccsens.yanyuan.bean.vo;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.ccsens.common.bean.vo.CProjectVo;
 import com.ccsens.util.WebConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,7 @@ import lombok.Data;
 public class ProjectVo {
     @Data
     @ApiModel("项目信息defaultProject")
-    public static class ProjectInfo{
+    public static class ProjectInfo {
         @ApiModelProperty("id")
         private Long id;
         @ApiModelProperty("项目名")
@@ -57,4 +58,10 @@ public class ProjectVo {
         @ApiModelProperty("导入类型(0-第一次导入,1-修改WBS)")
         private Byte importType = 0;;
     }
+
+    @Data
+    @ApiModel("项目信息")
+    public static class ProjectInformation extends CProjectVo.ProjectInfo {
+
+    }
 }

src/main/java/com/ccsens/yanyuan/bean/vo/RoleVo.java

@@ -0,0 +1,14 @@
+package com.ccsens.yanyuan.bean.vo;
+
+import com.ccsens.common.bean.vo.CProjectVo;
+import com.ccsens.common.bean.vo.CRoleVo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+public class RoleVo {
+    @Data
+    @ApiModel("角色信息")
+    public static class QueryRole extends CRoleVo.QueryRole {
+
+    }
+}

src/main/java/com/ccsens/yanyuan/bean/vo/TaskVo.java

@@ -0,0 +1,13 @@
+package com.ccsens.yanyuan.bean.vo;
+
+import com.ccsens.common.bean.vo.CTaskVo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+public class TaskVo {
+    @Data
+    @ApiModel("任务信息")
+    public static class QueryTask extends CTaskVo.QueryTask {
+
+    }
+}

src/main/java/com/ccsens/yanyuan/service/IYRoleService.java

@@ -0,0 +1,14 @@
+package com.ccsens.yanyuan.service;
+
+import com.ccsens.common.bean.dto.CRoleDto;
+import com.ccsens.common.bean.vo.CRoleVo;
+
+public interface IYRoleService {
+    /**
+     * 燕园查询角色列表
+     * @param param 入参
+     * @param userId 当前用户id
+     * @return 角色列表
+     */
+    CRoleVo.QueryRole queryShowRole(CRoleDto.QueryRoleById param, Long userId);
+}

src/main/java/com/ccsens/yanyuan/service/IYTaskService.java

@@ -0,0 +1,25 @@
+package com.ccsens.yanyuan.service;
+
+import com.ccsens.common.bean.vo.CTaskVo;
+import com.ccsens.yanyuan.bean.dto.TaskDto;
+import com.ccsens.yanyuan.bean.vo.TaskVo;
+
+import java.util.List;
+
+public interface IYTaskService {
+    /**
+     * 燕园查询没有时间的日常任务
+     * @param param 参数
+     * @param userId 当前用户id
+     * @return 任务列表
+     */
+    List<TaskVo.QueryTask> queryPermanentGlobalTask(TaskDto.QueryPermanentGlobalTask param, Long userId);
+
+    /**
+     * 燕园查询定期任务
+     * @param param 参数
+     * @param userId 当前用户id
+     * @return 定期任务列表
+     */
+    List<TaskVo.QueryTask> queryRegularTask(TaskDto.QueryRegularTask param, Long userId);
+}

src/main/java/com/ccsens/yanyuan/service/RoleService.java

@@ -0,0 +1,43 @@
+package com.ccsens.yanyuan.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ccsens.common.bean.dto.CRoleDto;
+import com.ccsens.common.bean.vo.CRoleVo;
+import com.ccsens.yanyuan.util.BasicsConstant;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+@Slf4j
+@Service
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+public class RoleService implements IYRoleService {
+
+    @Override
+    public CRoleVo.QueryRole queryShowRole(CRoleDto.QueryRoleById param, Long userId) {
+        CRoleVo.QueryRole queryRole = new CRoleVo.QueryRole();
+        List<CRoleVo.RoleInfo> visibleList = new ArrayList<>();
+        List<CRoleVo.RoleInfo> invisibleList = new ArrayList<>();
+        CRoleVo.RoleInfo drill = new CRoleVo.RoleInfo();
+        drill.setId(BasicsConstant.YanYuanRole.Drill.id);
+        drill.setName(BasicsConstant.YanYuanRole.Drill.name);
+        drill.setMine(BasicsConstant.YanYuanRole.Drill.mine);
+        drill.setPm(BasicsConstant.YanYuanRole.Drill.pm);
+        drill.setSequence(BasicsConstant.YanYuanRole.Drill.sequence);
+        visibleList.add(drill);
+        CRoleVo.RoleInfo setting = new CRoleVo.RoleInfo();
+        setting.setId(BasicsConstant.YanYuanRole.Setting.id);
+        setting.setName(BasicsConstant.YanYuanRole.Setting.name);
+        setting.setMine(BasicsConstant.YanYuanRole.Setting.mine);
+        setting.setPm(BasicsConstant.YanYuanRole.Setting.pm);
+        setting.setSequence(BasicsConstant.YanYuanRole.Setting.sequence);
+        visibleList.add(setting);
+        queryRole.setVisibleList(visibleList);
+        queryRole.setInvisibleList(invisibleList);
+        return queryRole;
+    }
+
+}

src/main/java/com/ccsens/yanyuan/service/YTaskService.java

@@ -0,0 +1,78 @@
+package com.ccsens.yanyuan.service;
+
+
+import com.ccsens.yanyuan.bean.dto.TaskDto;
+import com.ccsens.yanyuan.bean.vo.TaskVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Service
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+public class YTaskService implements IYTaskService {
+
+    @Override
+    public List<TaskVo.QueryTask> queryPermanentGlobalTask(TaskDto.QueryPermanentGlobalTask param, Long userId) {
+        List<TaskVo.QueryTask> queryTaskList = new ArrayList<>();
+        Long roleId = param.getRoleId();
+        String templateCode = param.getTemplateCode();
+        if ("yanyuan-user".equals(templateCode)) {
+            if (1 == roleId) {
+
+            }
+            if (2 == roleId) {
+                TaskVo.QueryTask queryTask = new TaskVo.QueryTask();
+                queryTask.setId(1L);
+                queryTask.setDetailId(2L);
+                queryTask.setName("WIFI绑定");
+                queryTask.setDescription("测试使用");
+                queryTaskList.add(queryTask);
+            }
+        }
+        if ("yanyuan-admin".equals(templateCode)) {
+            TaskVo.QueryTask queryTask = new TaskVo.QueryTask();
+            queryTask.setId(1L);
+            queryTask.setDetailId(2L);
+            queryTask.setName("后台管理");
+            queryTask.setDescription("测试后台");
+            queryTaskList.add(queryTask);
+        }
+
+        return queryTaskList;
+    }
+
+    @Override
+    public List<TaskVo.QueryTask> queryRegularTask(TaskDto.QueryRegularTask param, Long userId) {
+        List<TaskVo.QueryTask> queryTaskList = new ArrayList<>();
+        Long roleId = param.getRoleId();
+        String templateCode = param.getTemplateCode();
+        if ("yanyuan-user".equals(templateCode)) {
+            if (1 == roleId) {
+                TaskVo.QueryTask queryTask = new TaskVo.QueryTask();
+                queryTask.setId(1L);
+                queryTask.setDetailId(2L);
+                queryTask.setName("数独");
+                queryTask.setDescription("已测评之后");
+                queryTaskList.add(queryTask);
+            }
+            if (2 == roleId) {
+
+            }
+        }
+        if ("yanyuan-admin".equals(templateCode)) {
+            TaskVo.QueryTask queryTask = new TaskVo.QueryTask();
+            queryTask.setId(1L);
+            queryTask.setDetailId(2L);
+            queryTask.setName("后台管理");
+            queryTask.setDescription("测试后台");
+            queryTaskList.add(queryTask);
+        }
+        return queryTaskList;
+    }
+
+}

src/main/java/com/ccsens/yanyuan/util/BasicsConstant.java

@@ -1,5 +1,8 @@
 package com.ccsens.yanyuan.util;
 
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -46,5 +49,28 @@ public class BasicsConstant {
         WBS_DURATION.put("y",365 * 24 * 60 * 60 * 1000L);
     }
 
+    /** 燕园角色 */
+    public enum YanYuanRole {
+        /**
+         * 燕园角色
+         * 1.训练
+         * 2.设置
+         */
+        Drill(1L,0,0,"训练",0),
+        Setting(2L,0,0,"设置",1)
+        ;
+        public Long id;
+        public int pm;
+        public int mine;
+        public String name;
+        public int sequence;
 
+        YanYuanRole(Long id, Integer pm, Integer mine, String name, Integer sequence) {
+            this.id = id;
+            this.pm = pm;
+            this.mine = mine;
+            this.name = name;
+            this.sequence = sequence;
+        }
+    }
 }