From 7c1ee361e0ae7c89674b4ee8080e25d5661fae3e Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Tue, 28 Jul 2020 15:14:23 +0800 Subject: [PATCH] =?UTF-8?q?swagger=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Project_ManagementController.java | 33 +- .../yipin/liuwanr/entity/Judgment_Points.java | 183 ++++++----- .../liuwanr/entity/ManagementAndPointVo.java | 11 +- .../liuwanr/entity/Project_Management.java | 307 +++++++++--------- .../java/com/yipin/liuwanr/entity/Role.java | 6 +- 5 files changed, 293 insertions(+), 247 deletions(-) diff --git a/src/main/java/com/yipin/liuwanr/controller/Project_ManagementController.java b/src/main/java/com/yipin/liuwanr/controller/Project_ManagementController.java index 14afad3..cf7c0a3 100644 --- a/src/main/java/com/yipin/liuwanr/controller/Project_ManagementController.java +++ b/src/main/java/com/yipin/liuwanr/controller/Project_ManagementController.java @@ -198,8 +198,8 @@ public class Project_ManagementController { @ApiOperation(value = "实验任务列表", notes = "实验任务列表") @GetMapping("/getByjudgmentPointsId") Response getByjudgmentPointsId(@ApiParam(name = "judgmentPointsIds", value = "判分点主键id", required = true) @RequestParam List judgmentPointsIds, - @ApiParam(name = "projectId", value = "项目主键ID", required = false) @RequestParam(required = false) Integer projectId, - @ApiParam(name = "userId", value = "用户主键ID", required = false) @RequestParam(required = false) Integer userId) { + @ApiParam(name = "projectId", value = "项目主键ID", required = false) @RequestParam(required = false) Integer projectId, + @ApiParam(name = "userId", value = "用户主键ID", required = false) @RequestParam(required = false) Integer userId) { Response resp = new Response(); HashMap ret = service.getByjudgmentPointsId(judgmentPointsIds, projectId, userId); int status = (int) ret.get("retcode"); @@ -239,6 +239,11 @@ public class Project_ManagementController { /** * 添加角色 + * { + * "roleNumber": "1", + * "roleType": "0", + * "roleAttribute": "0" + * } * * @param role 角色 * @return @@ -268,7 +273,7 @@ public class Project_ManagementController { */ @ApiOperation(value = "实验数据列表", notes = "实验数据列表") @GetMapping("/getByRoleId") - Response getByRoleId(@ApiParam(name = "roleId", value = "角色id", required = true) @RequestParam List roleId) { + Response getByRoleId(@ApiParam(name = "roleId", value = "角色id", required = true) @RequestParam List roleId) { Response resp = new Response(); HashMap ret = service.getByRoleId(roleId); int status = (int) ret.get("retcode"); @@ -284,6 +289,28 @@ public class Project_ManagementController { /** * 添加创建项目管理信息 + * { + * "management": { + * "projectName": "111", + * "projectPermissions": 0, + * "experimentalGoal": "111", + * "caseDescription": "111", + * "systemId": "1", + * "userId": "4", + * "experimentSuggests": "111", + * "state": 1, + * "founder": 1, + * "isstartexperimental": 0, + * "isstartexperimentSuggests": 0 + * }, + * "pooints": [{ + * "judgmentPointsId": 184, + * "judgmentPointsName": "列表——元素的修改 ", + * "experimentalRequirements": "新学期开始，老师组织了学习小组，该学习小组有A,B,C,D五个学生\nList1=[''A'',''B'',''C'',''D'']\n列表元素-修改-请使用下标索引\n第三天上课，老师发现把E同学的名字打错了，应该T。请修改并打印本小组的全体学生", + * "score": "100" + * }], + * "roleId": [403] + * } * * @param vo 项目管理信息 * @return diff --git a/src/main/java/com/yipin/liuwanr/entity/Judgment_Points.java b/src/main/java/com/yipin/liuwanr/entity/Judgment_Points.java index a870816..f6cc41c 100644 --- a/src/main/java/com/yipin/liuwanr/entity/Judgment_Points.java +++ b/src/main/java/com/yipin/liuwanr/entity/Judgment_Points.java @@ -1,93 +1,110 @@ package com.yipin.liuwanr.entity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + /** * 判分表 + * "pooints": [{ + * "judgmentPointsId": 184, + * "judgmentPointsName": "列表——元素的修改 ", + * "experimentalRequirements": "新学期开始，老师组织了学习小组，该学习小组有A,B,C,D五个学生\nList1=[''A'',''B'',''C'',''D'']\n列表元素-修改-请使用下标索引\n第三天上课，老师发现把E同学的名字打错了，应该T。请修改并打印本小组的全体学生", + * "score": "100" + * }], */ +@ApiModel(value = "Judgment_Points对象", description = "判分点对象Judgment_Points") public class Judgment_Points { - - private Integer judgmentPointsId;// 判分点主键Id - private String judgmentPointsName;// 判分点名称 - private String experimentalRequirements;//实验要求 - private String projectId;//绑定项目管理Id - private Integer judgmentPointsType;// 判分点类型(1、编程类 2、交易类 3、工具类 4、业务类) - private Integer isdel;// 是否删除(0、未删除 1、已删除) - private Integer systemId; - private Integer userId; - - private Integer score;//判分点指标的分数 - - public Integer getSystemId() { - return systemId; - } - - public void setSystemId(Integer systemId) { - this.systemId = systemId; - } - - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public Integer getScore() { - return score; - } - - public void setScore(Integer score) { - this.score = score; - } - - public Integer getJudgmentPointsId() { - return judgmentPointsId; - } - - public void setJudgmentPointsId(Integer judgmentPointsId) { - this.judgmentPointsId = judgmentPointsId; - } - - public String getJudgmentPointsName() { - return judgmentPointsName; - } - - public void setJudgmentPointsName(String judgmentPointsName) { - this.judgmentPointsName = judgmentPointsName; - } - - public String getExperimentalRequirements() { - return experimentalRequirements; - } - - public void setExperimentalRequirements(String experimentalRequirements) { - this.experimentalRequirements = experimentalRequirements; - } - - public String getProjectId() { - return projectId; - } - - public void setProjectId(String projectId) { - this.projectId = projectId; - } - - public Integer getJudgmentPointsType() { - return judgmentPointsType; - } - - public void setJudgmentPointsType(Integer judgmentPointsType) { - this.judgmentPointsType = judgmentPointsType; - } - - public Integer getIsdel() { - return isdel; - } - - public void setIsdel(Integer isdel) { - this.isdel = isdel; - } + @ApiModelProperty(value = "判分点主键Id", name = "judgmentPointsId", example = "184", required = true) + private Integer judgmentPointsId;// 判分点主键Id + @ApiModelProperty(value = "判分点名称", name = "judgmentPointsName", example = "列表——元素的修改", required = true) + private String judgmentPointsName;// 判分点名称 + @ApiModelProperty(value = "实验要求", name = "experimentalRequirements", example = "新学期开始，老师组织了学习小组，该学习小组有A,B,C,D五个学生\\nList1=[''A'',''B'',''C'',''D'']\\n列表元素-修改-请使用下标索引\\n第三天上课，老师发现把E同学的名字打错了，应该T。请修改并打印本小组的全体学生", required = true) + private String experimentalRequirements;//实验要求 + @ApiModelProperty(hidden = true) + private String projectId;//绑定项目管理Id + @ApiModelProperty(hidden = true) + private Integer judgmentPointsType;// 判分点类型(1、编程类 2、交易类 3、工具类 4、业务类) + @ApiModelProperty(hidden = true) + private Integer isdel;// 是否删除(0、未删除 1、已删除) + @ApiModelProperty(hidden = true) + private Integer systemId; + @ApiModelProperty(hidden = true) + private Integer userId; + @ApiModelProperty(value = "判分点指标的分数", name = "score", example = "100", required = true) + private Integer score;//判分点指标的分数 + + public Integer getSystemId() { + return systemId; + } + + public void setSystemId(Integer systemId) { + this.systemId = systemId; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getScore() { + return score; + } + + public void setScore(Integer score) { + this.score = score; + } + + public Integer getJudgmentPointsId() { + return judgmentPointsId; + } + + public void setJudgmentPointsId(Integer judgmentPointsId) { + this.judgmentPointsId = judgmentPointsId; + } + + public String getJudgmentPointsName() { + return judgmentPointsName; + } + + public void setJudgmentPointsName(String judgmentPointsName) { + this.judgmentPointsName = judgmentPointsName; + } + + public String getExperimentalRequirements() { + return experimentalRequirements; + } + + public void setExperimentalRequirements(String experimentalRequirements) { + this.experimentalRequirements = experimentalRequirements; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public Integer getJudgmentPointsType() { + return judgmentPointsType; + } + + public void setJudgmentPointsType(Integer judgmentPointsType) { + this.judgmentPointsType = judgmentPointsType; + } + + public Integer getIsdel() { + return isdel; + } + + public void setIsdel(Integer isdel) { + this.isdel = isdel; + } } diff --git a/src/main/java/com/yipin/liuwanr/entity/ManagementAndPointVo.java b/src/main/java/com/yipin/liuwanr/entity/ManagementAndPointVo.java index f1fb029..a4a37c1 100644 --- a/src/main/java/com/yipin/liuwanr/entity/ManagementAndPointVo.java +++ b/src/main/java/com/yipin/liuwanr/entity/ManagementAndPointVo.java @@ -1,17 +1,20 @@ package com.yipin.liuwanr.entity; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.List; +@ApiModel(value = "ManagementAndPointVo对象", description = "添加项目管理对象ManagementAndPointVo") public class ManagementAndPointVo { - + @ApiModelProperty(value = "项目管理实体类", name = "management", required = true) private Project_Management management;//项目管理 - @ApiModelProperty(example = "key:判分点主键 value:分数", required = true) - private List pooints;//判分点信息 + //@ApiModelProperty(value = "判分点信息列表，key:判分点主键 value:分数", name = "pooints", example = "[{\"judgmentPointsId\":184,\"judgmentPointsName\":\"列表——元素的修改 \",\"experimentalRequirements\":\"新学期开始，老师组织了学习小组，该学习小组有A,B,C,D五个学生\\nList1=[''A'',''B'',''C'',''D'']\\n列表元素-修改-请使用下标索引\\n第三天上课，老师发现把E同学的名字打错了，应该T。请修改并打印本小组的全体学生\",\"score\":\"100\"}]", required = true) + @ApiModelProperty(value = "判分点信息列表，key:判分点主键 value:分数", name = "pooints", required = true) + private List pooints;//判分点信息 - @ApiModelProperty(example = "角色id", required = true) + @ApiModelProperty(value = "角色id列表", name = "roleId", example = "[403]", required = true) private List roleId;//存储角色id public Project_Management getManagement() { diff --git a/src/main/java/com/yipin/liuwanr/entity/Project_Management.java b/src/main/java/com/yipin/liuwanr/entity/Project_Management.java index 1143a2b..2580928 100644 --- a/src/main/java/com/yipin/liuwanr/entity/Project_Management.java +++ b/src/main/java/com/yipin/liuwanr/entity/Project_Management.java @@ -5,222 +5,221 @@ import io.swagger.annotations.ApiModelProperty; /** * 项目管理 - * - * @author 86151 * + * @author 86151 */ @ApiModel(value = "Project_Management对象", description = "项目管理对象Project_Management") public class Project_Management { - @ApiModelProperty(hidden = true) - private Integer projectId;// 项目主键ID + @ApiModelProperty(hidden = true) + private Integer projectId;// 项目主键ID - @ApiModelProperty(example = "大庆项目", required = true) - private String projectName;// 项目名称 + @ApiModelProperty(value = "项目名称", name = "projectName", example = "python教学项目", required = true) + private String projectName;// 项目名称 - @ApiModelProperty(example = "(0、练习 1、考核 2、竞赛)", required = true) - private Integer projectPermissions;// 项目权限(0、练习 1、考核 2、竞赛) + @ApiModelProperty(value = "项目权限(0、练习 1、考核 2、竞赛)", name = "projectPermissions", example = "0", required = true) + private Integer projectPermissions;// 项目权限(0、练习 1、考核 2、竞赛) - @ApiModelProperty(example = "创建人(0、系统 1、老师)", required = true) - private Integer founder;// 创建人(0、系统 1、老师) + @ApiModelProperty(value = "创建人(0、系统 1、老师)", name = "founder", example = "0", required = true) + private Integer founder;// 创建人(0、系统 1、老师) - @ApiModelProperty(hidden = true) - private String creationTime;// 创建时间 + @ApiModelProperty(hidden = true) + private String creationTime;// 创建时间 - @ApiModelProperty(example = "状态(0、草稿箱 1、已发布)", required = true) - private Integer state;// 状态(0、草稿箱 1、已发布) + @ApiModelProperty(value = "状态(0、草稿箱 1、已发布)", name = "state", example = "0", required = true) + private Integer state;// 状态(0、草稿箱 1、已发布) - @ApiModelProperty(example = "实验目标", required = true) - private String experimentalGoal;// 实验目标 + @ApiModelProperty(value = "实验目标", name = "experimentalGoal", example = "学会十以内加减法", required = true) + private String experimentalGoal;// 实验目标 - @ApiModelProperty(example = "案例描述", required = true) - private String caseDescription; // 案例描述 + @ApiModelProperty(value = "案例描述", name = "caseDescription", example = "一加一等于二", required = true) + private String caseDescription; // 案例描述 - @ApiModelProperty(hidden = true) - private String experimentTask;// 实验任务 + @ApiModelProperty(hidden = true) + private String experimentTask;// 实验任务 - @ApiModelProperty(hidden = true) - private String experimentalDataId;// 绑定实验数据ID + @ApiModelProperty(hidden = true) + private String experimentalDataId;// 绑定实验数据ID - @ApiModelProperty(example = "实验提示", required = true) - private String experimentSuggests; // 实验提示 + @ApiModelProperty(value = "实验提示", name = "experimentSuggests", example = "一加一等于二", required = true) + private String experimentSuggests; // 实验提示 - @ApiModelProperty(example = "绑定服务配置ID", required = true) - private Integer systemId;// 绑定服务配置ID + @ApiModelProperty(value = "绑定服务配置ID", name = "systemId", example = "1", required = true) + private Integer systemId;// 绑定服务配置ID - @ApiModelProperty(hidden = true) - private Integer isdel; + @ApiModelProperty(hidden = true) + private Integer isdel; - @ApiModelProperty(hidden = true) - private Integer isShow; + @ApiModelProperty(hidden = true) + private Integer isShow; - @ApiModelProperty(example = "是否启用实验数据(0启用 1不启用)", required = true) - private Integer isstartexperimental;//是否启用实验数据(0启用 1不启用) + @ApiModelProperty(value = "是否启用实验数据(0启用 1不启用)", name = "isstartexperimental", example = "0", required = true) + private Integer isstartexperimental;//是否启用实验数据(0启用 1不启用) - @ApiModelProperty(example = "是否启用实验提示(0启用 1不启用)", required = true) - private Integer isstartexperimentSuggests; + @ApiModelProperty(value = "是否启用实验提示(0启用 1不启用)", name = "isstartexperimentSuggests", example = "0", required = true) + private Integer isstartexperimentSuggests; - @ApiModelProperty(hidden = true) - private Integer isExperiment; + @ApiModelProperty(hidden = true) + private Integer isExperiment; - @ApiModelProperty(hidden = true) - private Integer isAttendance; + @ApiModelProperty(hidden = true) + private Integer isAttendance; - @ApiModelProperty(example = "用户ID", required = true) - private Integer userId; + @ApiModelProperty(value = "用户ID", name = "userId", example = "4", required = true) + private Integer userId; - public Integer getUserId() { - return userId; - } + public Integer getUserId() { + return userId; + } - public void setUserId(Integer userId) { - this.userId = userId; - } + public void setUserId(Integer userId) { + this.userId = userId; + } - public Integer getIsstartexperimental() { - return isstartexperimental; - } + public Integer getIsstartexperimental() { + return isstartexperimental; + } - public void setIsstartexperimental(Integer isstartexperimental) { - this.isstartexperimental = isstartexperimental; - } + public void setIsstartexperimental(Integer isstartexperimental) { + this.isstartexperimental = isstartexperimental; + } - public Integer getIsstartexperimentSuggests() { - return isstartexperimentSuggests; - } + public Integer getIsstartexperimentSuggests() { + return isstartexperimentSuggests; + } - public void setIsstartexperimentSuggests(Integer isstartexperimentSuggests) { - this.isstartexperimentSuggests = isstartexperimentSuggests; - } + public void setIsstartexperimentSuggests(Integer isstartexperimentSuggests) { + this.isstartexperimentSuggests = isstartexperimentSuggests; + } - public Integer getProjectId() { - return projectId; - } + public Integer getProjectId() { + return projectId; + } - public void setProjectId(Integer projectId) { - this.projectId = projectId; - } + public void setProjectId(Integer projectId) { + this.projectId = projectId; + } - public String getProjectName() { - return projectName; - } + public String getProjectName() { + return projectName; + } - public void setProjectName(String projectName) { - this.projectName = projectName; - } + public void setProjectName(String projectName) { + this.projectName = projectName; + } - public Integer getProjectPermissions() { - return projectPermissions; - } + public Integer getProjectPermissions() { + return projectPermissions; + } - public void setProjectPermissions(Integer projectPermissions) { - this.projectPermissions = projectPermissions; - } + public void setProjectPermissions(Integer projectPermissions) { + this.projectPermissions = projectPermissions; + } - public Integer getFounder() { - return founder; - } + public Integer getFounder() { + return founder; + } - public void setFounder(Integer founder) { - this.founder = founder; - } + public void setFounder(Integer founder) { + this.founder = founder; + } - public String getCreationTime() { - return creationTime; - } + public String getCreationTime() { + return creationTime; + } - public void setCreationTime(String creationTime) { - this.creationTime = creationTime; - } + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } - public Integer getState() { - return state; - } + public Integer getState() { + return state; + } - public void setState(Integer state) { - this.state = state; - } + public void setState(Integer state) { + this.state = state; + } - public String getExperimentalGoal() { - return experimentalGoal; - } + public String getExperimentalGoal() { + return experimentalGoal; + } - public void setExperimentalGoal(String experimentalGoal) { - this.experimentalGoal = experimentalGoal; - } + public void setExperimentalGoal(String experimentalGoal) { + this.experimentalGoal = experimentalGoal; + } - public String getCaseDescription() { - return caseDescription; - } + public String getCaseDescription() { + return caseDescription; + } - public void setCaseDescription(String caseDescription) { - this.caseDescription = caseDescription; - } + public void setCaseDescription(String caseDescription) { + this.caseDescription = caseDescription; + } - public String getExperimentTask() { - return experimentTask; - } + public String getExperimentTask() { + return experimentTask; + } - public void setExperimentTask(String experimentTask) { - this.experimentTask = experimentTask; - } + public void setExperimentTask(String experimentTask) { + this.experimentTask = experimentTask; + } - public Integer getIsdel() { - return isdel; - } + public Integer getIsdel() { + return isdel; + } - public void setIsdel(Integer isdel) { - this.isdel = isdel; - } + public void setIsdel(Integer isdel) { + this.isdel = isdel; + } - public Integer getIsShow() { - return isShow; - } + public Integer getIsShow() { + return isShow; + } - public void setIsShow(Integer isShow) { - this.isShow = isShow; - } + public void setIsShow(Integer isShow) { + this.isShow = isShow; + } - public String getExperimentalDataId() { - return experimentalDataId; - } + public String getExperimentalDataId() { + return experimentalDataId; + } - public void setExperimentalDataId(String experimentalDataId) { - this.experimentalDataId = experimentalDataId; - } + public void setExperimentalDataId(String experimentalDataId) { + this.experimentalDataId = experimentalDataId; + } - public String getExperimentSuggests() { - return experimentSuggests; - } + public String getExperimentSuggests() { + return experimentSuggests; + } - public void setExperimentSuggests(String experimentSuggests) { - this.experimentSuggests = experimentSuggests; - } + public void setExperimentSuggests(String experimentSuggests) { + this.experimentSuggests = experimentSuggests; + } - public Integer getSystemId() { - return systemId; - } + public Integer getSystemId() { + return systemId; + } - public void setSystemId(Integer systemId) { - this.systemId = systemId; - } + public void setSystemId(Integer systemId) { + this.systemId = systemId; + } - public Integer getIsExperiment() { - return isExperiment; - } + public Integer getIsExperiment() { + return isExperiment; + } - public void setIsExperiment(Integer isExperiment) { - this.isExperiment = isExperiment; - } + public void setIsExperiment(Integer isExperiment) { + this.isExperiment = isExperiment; + } - public Integer getIsAttendance() { - return isAttendance; - } + public Integer getIsAttendance() { + return isAttendance; + } - public void setIsAttendance(Integer isAttendance) { - this.isAttendance = isAttendance; - } + public void setIsAttendance(Integer isAttendance) { + this.isAttendance = isAttendance; + } } diff --git a/src/main/java/com/yipin/liuwanr/entity/Role.java b/src/main/java/com/yipin/liuwanr/entity/Role.java index 493564d..1c90473 100644 --- a/src/main/java/com/yipin/liuwanr/entity/Role.java +++ b/src/main/java/com/yipin/liuwanr/entity/Role.java @@ -18,11 +18,11 @@ public class Role implements Serializable { @ApiModelProperty(hidden = true) private String roleName;// 角色名称 //@ApiModelProperty(value = "角色数量", name = "roleNumber", example = "角色数量", required = true) - @ApiModelProperty(example = "角色数量", required = true) + @ApiModelProperty(value = "角色数量", name = "roleNumber", example = "2", required = true) private Integer roleNumber;// 角色数量 - @ApiModelProperty(example = "角色类型(0借款人 1贷款人 2保荐人)", required = true) + @ApiModelProperty(value = "角色类型(0借款人 1贷款人 2保荐人)", name = "roleType", example = "0", required = true) private Integer roleType;// 角色类型 - @ApiModelProperty(example = "角色属性(0个人 1公司)", required = true) + @ApiModelProperty(value = "角色属性(0个人 1公司)", name = "roleAttribute", example = "0", required = true) private Integer roleAttribute;// 角色属性 public Integer getRoleId() {