liusheng
2023-06-15 ccb88dea3ea2f4330b1790050c14812eac4ad61b
swagger修改
已修改7个文件
149 ■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagcategoryController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivetagController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/BaseTag.java 108 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/SvyLibTopic.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java
@@ -32,7 +32,7 @@
 * @author ruoyi
 * @date 2023-06-06
 */
@Api("标签")
@Api(description = "标签")
@RestController
@RequestMapping("/base/tag")
public class BaseTagController extends BaseController {
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagcategoryController.java
@@ -8,6 +8,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.BaseTagcategory;
import com.smartor.service.IBaseTagcategoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -22,6 +23,7 @@
 * @author ruoyi
 * @date 2023-06-15
 */
@Api(description = "标签分类")
@RestController
@RequestMapping("/system/tagcategory")
public class BaseTagcategoryController extends BaseController {
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
@@ -18,12 +18,9 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -35,7 +32,7 @@
 * @author smartor
 * @date 2023-03-04
 */
@Api("患者档案")
@Api(description = "患者档案")
@RestController
@RequestMapping("/smartor/patarchive")
public class PatArchiveController extends BaseController {
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivetagController.java
@@ -5,6 +5,7 @@
import com.smartor.domain.PatArchivetag;
import com.smartor.service.IPatArchivetagService;
import io.swagger.annotations.Api;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -28,6 +29,7 @@
 * @author ruoyi
 * @date 2023-06-13
 */
@Api(description = "患者档案标签")
@RestController
@RequestMapping("/system/archivetag")
public class PatArchivetagController extends BaseController {
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java
@@ -36,7 +36,7 @@
 * @author ruoyi
 * @date 2023-03-03
 */
@Api("问卷题目")
@Api(description = "问卷题目")
@RestController
@RequestMapping("/smartor/svytopic")
public class SvyLibTopicController extends BaseController {
smartor/src/main/java/com/smartor/domain/BaseTag.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -16,140 +17,67 @@
 * @author ruoyi
 * @date 2023-06-02
 */
@ApiModel(value = "BaseTag", description = "标签对象")
@Data
public class BaseTag extends BaseEntity {
    private static final long serialVersionUID = 1L;
    /**
     * 自增ID
     */
    @ApiModelProperty(name = "自增ID")
    @ApiModelProperty("自增ID")
    @Excel(name = " 自增ID ")
    private Long tagid;
    /**
     * 标签分类ID
     */
    @ApiModelProperty(name = "标签分类ID")
    @ApiModelProperty("标签分类ID")
    @Excel(name = " 标签分类ID ")
    private Long tagcategoryid;
    /**
     * 标签名称
     */
    @ApiModelProperty(name = "标签名称")
    @ApiModelProperty("标签名称")
    @Excel(name = " 标签名称 ")
    private String tagname;
    /**
     * 标签描述
     */
    @ApiModelProperty(name = "标签描述")
    @ApiModelProperty("标签描述")
    @Excel(name = " 标签描述 ")
    private String tagdescription;
    /**
     * 机构ID
     */
    @ApiModelProperty(name = "机构ID")
    @ApiModelProperty("机构ID")
    @Excel(name = " 机构ID ")
    private String orgid;
    /**
     * 删除标记
     */
    @ApiModelProperty(name = "删除标记")
    @ApiModelProperty("删除标记")
    @Excel(name = " 删除标记 ")
    private String delFlag;
    /**
     * 上传标记
     */
    @ApiModelProperty(name = "上传标记")
    @ApiModelProperty("上传标记")
    @Excel(name = " 上传标记 ")
    private Long isupload;
    /**
     * 上传时间
     */
    @ApiModelProperty(name = "上传时间")
    @ApiModelProperty("上传时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " 上传时间 ", width = 30, dateFormat = "yyyy-MM-dd")
    private Date uploadTime;
    /**
     * 是否开启
     */
    @ApiModelProperty(name = "是否开启")
    private Long isenable;
    public void setTagid(Long tagid) {
        this.tagid = tagid;
    }
    public Long getTagid() {
        return tagid;
    }
    public void setTagcategoryid(Long tagcategoryid) {
        this.tagcategoryid = tagcategoryid;
    }
    public Long getTagcategoryid() {
        return tagcategoryid;
    }
    public void setTagname(String tagname) {
        this.tagname = tagname;
    }
    public String getTagname() {
        return tagname;
    }
    public void setTagdescription(String tagdescription) {
        this.tagdescription = tagdescription;
    }
    public String getTagdescription() {
        return tagdescription;
    }
    public void setOrgid(String orgid) {
        this.orgid = orgid;
    }
    public String getOrgid() {
        return orgid;
    }
    public void setDelFlag(String delFlag) {
        this.delFlag = delFlag;
    }
    public String getDelFlag() {
        return delFlag;
    }
    public void setIsupload(Long isupload) {
        this.isupload = isupload;
    }
    public Long getIsupload() {
        return isupload;
    }
    public void setUploadTime(Date uploadTime) {
        this.uploadTime = uploadTime;
    }
    public Date getUploadTime() {
        return uploadTime;
    }
    public void setIsenable(Long isenable) {
        this.isenable = isenable;
    }
    public Long getIsenable() {
        return isenable;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("tagid", getTagid()).append("tagcategoryid", getTagcategoryid()).append("tagname", getTagname()).append("tagdescription", getTagdescription()).append("orgid", getOrgid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).append("isenable", getIsenable()).toString();
    }
}
smartor/src/main/java/com/smartor/domain/SvyLibTopic.java
@@ -25,91 +25,91 @@
    /**
     * 自增ID
     */
    @ApiModelProperty(name = "自增ID")
    @ApiModelProperty("自增ID")
    private Long topicid;
    /**
     * 老版本ID
     */
    @ApiModelProperty(name = "老版本ID")
    @ApiModelProperty("老版本ID")
    private Long oldid;
    /**
     * 问卷ID
     */
    @Excel(name = " 问卷ID ")
    @ApiModelProperty(name = "问卷ID")
    @ApiModelProperty("问卷ID")
    private Long svyid;
    /**
     * 题目类型;枚举 1.单选 2多选 3填空
     */
    @Excel(name = " 题目类型;枚举 1.单选 2多选 3填空 ")
    @ApiModelProperty(name = "题目类型;枚举 1.单选 2多选 3填空")
    @ApiModelProperty("题目类型;枚举 1.单选 2多选 3填空")
    private Long topictype;
    /**
     * 题目Code
     */
    @ApiModelProperty(name = "题目Code")
    @ApiModelProperty("题目Code")
    private String topiccode;
    /**
     * 题目
     */
    @Excel(name = " 题目 ")
    @ApiModelProperty(name = "题目")
    @ApiModelProperty("题目")
    private String topic;
    /**
     * 排序
     */
    @Excel(name = " 排序 ")
    @ApiModelProperty(name = "排序")
    @ApiModelProperty("排序")
    private Long sort;
    /**
     * 是否必填
     */
    @ApiModelProperty(name = "是否必填")
    @ApiModelProperty("是否必填")
    private Long ismandatory;
    /**
     * 是否隐藏
     */
    @Excel(name = " 是否隐藏 ")
    @ApiModelProperty(name = "是否隐藏")
    @ApiModelProperty("是否隐藏")
    private Long ishide;
    /**
     * 删除标记
     */
    @ApiModelProperty(name = "删除标记")
    @ApiModelProperty("删除标记")
    private String delFlag;
    /**
     * 机构ID
     */
    @Excel(name = " 机构ID ")
    @ApiModelProperty(name = "机构ID")
    @ApiModelProperty("机构ID")
    private String orgid;
    /**
     * 上传标记
     */
    @ApiModelProperty(name = "上传标记")
    @ApiModelProperty("上传标记")
    private Long isupload;
    /**
     * 上传标记
     */
    @ApiModelProperty(name = "标签")
    @ApiModelProperty("标签")
    private String tag;
    /**
     * 上传时间
     */
    @ApiModelProperty(name = "上传时间")
    @ApiModelProperty("上传时间")
    private Date uploadTime;