升级jdk17

pull/1/head
liu 11 months ago
parent 73caeb6a1f
commit 27de488927

@ -53,7 +53,6 @@
<poi-ooxml.version>4.1.2</poi-ooxml.version> <poi-ooxml.version>4.1.2</poi-ooxml.version>
<freemarker.version>2.3.31</freemarker.version> <freemarker.version>2.3.31</freemarker.version>
<mysql-connector-java.version>8.0.26</mysql-connector-java.version> <mysql-connector-java.version>8.0.26</mysql-connector-java.version>
<io-swagger.version>1.5.22</io-swagger.version>
<lock4j.version>2.2.5</lock4j.version> <lock4j.version>2.2.5</lock4j.version>
<minio.version>8.5.7</minio.version> <minio.version>8.5.7</minio.version>
<okhttp.version>4.9.0</okhttp.version> <okhttp.version>4.9.0</okhttp.version>
@ -152,11 +151,6 @@
<version>${poi-ooxml.version}</version> <version>${poi-ooxml.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${io-swagger.version}</version>
</dependency>
<dependency> <dependency>
<groupId>io.minio</groupId> <groupId>io.minio</groupId>

@ -36,6 +36,7 @@
<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId> <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId> <artifactId>spring-boot-starter-data-redis</artifactId>
@ -113,11 +114,6 @@
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</dependency>
</dependencies> </dependencies>

@ -11,7 +11,6 @@ import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;
@ -22,20 +21,14 @@ import java.util.Map;
@Slf4j @Slf4j
public class JwtInterceptor implements HandlerInterceptor { public class JwtInterceptor implements HandlerInterceptor {
private final RedisTemplate<String, String> redisTemplate;
public JwtInterceptor(RedisTemplate<String, String> redisTemplate) {
this.redisTemplate = redisTemplate;
}
@Override @Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
//请求消息头获取用户ID //请求消息头获取用户ID
String token = request.getHeader("token"); String token = request.getHeader("token");
if (StrUtil.isBlank(token)) { if (StrUtil.isBlank(token)) {
// 如果是swagger来的接口,说明这里是测试的,会伪造一个用户 // 如果是swagger来的接口,说明这里是测试的,会伪造一个用户
if (StrUtil.isNotBlank(request.getHeader("Knife4j-Gateway-Code"))) { String referer = request.getHeader("Referer");
if (StrUtil.isNotBlank(referer) && StrUtil.contains(referer, "doc.html")) {
cacheAuth(JWTUtil.parseToken(devActiveUser())); cacheAuth(JWTUtil.parseToken(devActiveUser()));
return true; return true;
} else { } else {

@ -1,51 +0,0 @@
/*
* : Knife4jConfig
* :
* : <>
* : RedName
* : 2022/8/5
* : <>
* : <>
* : <>
*/
package com.supervision.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Contact;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
/**
* <>
*
* @author ljt
* @version [, 2022/8/5]
* @see [/]
* @since [/]
*/
@Configuration
@EnableSwagger2WebMvc
public class Knife4jConfig {
@Bean(value = "defaultApi2")
public Docket defaultApi2() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(this.apiInfo())
.useDefaultResponseMessages(false)
.select()
.apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
.paths(PathSelectors.any()).build();
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder().title("API文档").description("API文档").contact(new Contact("", "", ""))
.version("1.0.0").build();
}
}

@ -0,0 +1,52 @@
package com.supervision.config;
import cn.hutool.core.util.RandomUtil;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.info.License;
import org.springdoc.core.customizers.GlobalOpenApiCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.HashMap;
import java.util.Map;
@Configuration
public class SwaggerConfiguration {
/**
* @Tag x-order
*
* @return the global open api customizer
*/
@Bean
public GlobalOpenApiCustomizer orderGlobalOpenApiCustomizer() {
return openApi -> {
if (openApi.getTags() != null) {
openApi.getTags().forEach(tag -> {
Map<String, Object> map = new HashMap<>();
map.put("x-order", RandomUtil.randomInt(0, 100));
tag.setExtensions(map);
});
}
if (openApi.getPaths() != null) {
openApi.addExtension("x-test123", "333");
openApi.getPaths().addExtension("x-abb", RandomUtil.randomInt(1, 100));
}
};
}
@Bean
public OpenAPI customOpenAPI() {
return new OpenAPI()
.info(new Info()
.title("XXX用户系统API")
.version("1.0")
.description("Knife4j集成springdoc-openapi示例")
.termsOfService("http://doc.xiaominfo.com")
.license(new License().name("Apache 2.0")
.url("http://doc.xiaominfo.com")));
}
}

@ -6,10 +6,8 @@ import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@ -21,23 +19,23 @@ import java.util.List;
@Configuration @Configuration
public class WebConfig implements WebMvcConfigurer { public class WebConfig implements WebMvcConfigurer {
@Autowired
private RedisTemplate<String, String> redisTemplate;
@Override @Override
public void addInterceptors(InterceptorRegistry registry) { public void addInterceptors(InterceptorRegistry registry) {
// 添加权限拦截器 // 添加权限拦截器
registry.addInterceptor(new JwtInterceptor(redisTemplate)) // registry.addInterceptor(new JwtInterceptor())
.addPathPatterns("/**") // .addPathPatterns("/**")
.excludePathPatterns(ignorePathPatterns()); // .excludePathPatterns(ignorePathPatterns());
} }
public List<String> ignorePathPatterns() { public List<String> ignorePathPatterns() {
List<String> paths = new ArrayList<>(); List<String> paths = new ArrayList<>();
paths.add("/swagger-resources/**"); paths.add("/swagger-resources/**");
paths.add("/webjars/**"); paths.add("/webjars/**");
paths.add("/v2/**"); paths.add("/v3/**");
paths.add("/swagger-ui.html/**"); paths.add("/swagger-ui.html/**");
paths.add("/swagger-ui/**");
paths.add("/webjars/");
paths.add("/doc.html/**"); paths.add("/doc.html/**");
paths.add("/error"); paths.add("/error");
paths.add("/favicon.ico"); paths.add("/favicon.ico");
@ -49,7 +47,7 @@ public class WebConfig implements WebMvcConfigurer {
paths.add("/medicalRecManage/downloadMedicalAnswerTemplate"); paths.add("/medicalRecManage/downloadMedicalAnswerTemplate");
paths.add("/qaKnowledge/**"); paths.add("/qaKnowledge/**");
// 开发环境,放开不校验token.每次修改这里需要重启(热部署不行) // 开发环境,放开不校验token.每次修改这里需要重启(热部署不行)
// paths.add("/**"); paths.add("/**");
return paths; return paths;
} }

@ -1,19 +1,15 @@
package com.supervision.domain; package com.supervision.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@Data @Data
@ApiModel
public class GlobalResult<T> { public class GlobalResult<T> {
private int code = 200; private int code = 200;
private String msg = "success"; private String msg = "success";
@ApiModelProperty
private T data; private T data;

@ -38,6 +38,11 @@
<artifactId>spring-cloud-starter-openfeign</artifactId> <artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-loadbalancer</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.alibaba.cloud</groupId> <groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId> <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>

@ -3,29 +3,29 @@ package com.supervision.controller;
import com.supervision.service.GraphNebulaService; import com.supervision.service.GraphNebulaService;
import com.supervision.vo.GraphVO; import com.supervision.vo.GraphVO;
import com.supervision.vo.TreeNodeVO; import com.supervision.vo.TreeNodeVO;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
@Api(tags = "Nebula图谱") @Tag(name = "Nebula图谱")
@RestController("nebulaGraph") @RestController("nebulaGraph")
@RequiredArgsConstructor @RequiredArgsConstructor
public class GraphNebulaController { public class GraphNebulaController {
private final GraphNebulaService graphNebulaService; private final GraphNebulaService graphNebulaService;
@ApiOperation("创建图谱") @Operation(summary = "创建图谱")
@GetMapping("createGraph") @GetMapping("createGraph")
public void createGraph(String processId) { public void createGraph(String processId) {
graphNebulaService.creatGraphByNebula(processId); graphNebulaService.creatGraphByNebula(processId);
} }
@ApiOperation("查询图谱") @Operation(summary = "查询图谱")
@GetMapping("queryGraph") @GetMapping("queryGraph")
public GraphVO queryGraph(String processId, Integer level) { public GraphVO queryGraph(String processId, Integer level) {
GraphVO graphVO = graphNebulaService.queryGraph(processId, level); GraphVO graphVO = graphNebulaService.queryGraph(processId, level);
@ -34,7 +34,7 @@ public class GraphNebulaController {
} }
@ApiOperation("查询树形结构图") @Operation(summary = "查询树形结构图")
@GetMapping("queryTreeGraph") @GetMapping("queryTreeGraph")
public List<TreeNodeVO> queryTreeGraph(String processId, Integer level) { public List<TreeNodeVO> queryTreeGraph(String processId, Integer level) {
return graphNebulaService.queryTreeGraph(processId, level); return graphNebulaService.queryTreeGraph(processId, level);

@ -8,8 +8,8 @@ import com.supervision.nebula.dto.graph.GraphShowInfo;
import com.supervision.nebula.service.AttributeService; import com.supervision.nebula.service.AttributeService;
import com.supervision.nebula.service.GraphCommonService; import com.supervision.nebula.service.GraphCommonService;
import com.supervision.nebula.vo.AttributeVo; import com.supervision.nebula.vo.AttributeVo;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -21,7 +21,7 @@ import java.util.List;
@SuppressWarnings("ALL") @SuppressWarnings("ALL")
@RestController @RestController
@RequestMapping("/attribute") @RequestMapping("/attribute")
@Api(tags = "属性查询控制器") @Tag(name = "属性查询控制器")
@RequiredArgsConstructor @RequiredArgsConstructor
public class AttributeController { public class AttributeController {
@ -30,25 +30,25 @@ public class AttributeController {
private final AttributeService attributeService; private final AttributeService attributeService;
@PostMapping("/list") @PostMapping("/list")
@ApiOperation("属性查询(spaces tags edges列表)") @Operation(summary = "属性查询(spaces tags edges列表)")
public List<AttributeVo> showAttribute(@RequestBody GraphShowAttribute graphShowAttribute) { public List<AttributeVo> showAttribute(@RequestBody GraphShowAttribute graphShowAttribute) {
return attributeService.showAttribute(graphShowAttribute); return attributeService.showAttribute(graphShowAttribute);
} }
@PostMapping("/page") @PostMapping("/page")
@ApiOperation("属性分页查询 tags edges 分页列表") @Operation(summary = "属性分页查询 tags edges 分页列表")
public PageInfo<AttributeVo.DataBean> pageListAttribute(@RequestBody GraphPageAttribute graphPageAttribute) { public PageInfo<AttributeVo.DataBean> pageListAttribute(@RequestBody GraphPageAttribute graphPageAttribute) {
return attributeService.pageListAttribute(graphPageAttribute); return attributeService.pageListAttribute(graphPageAttribute);
} }
@PostMapping("/listProperty") @PostMapping("/listProperty")
@ApiOperation("属性的子属性列表查询 tag edge 的属性列表查询") @Operation(summary = "属性的子属性列表查询 tag edge 的属性列表查询")
public List<AttributeVo> showAttributeInfo(@RequestBody GraphShowInfo graphShowInfo) { public List<AttributeVo> showAttributeInfo(@RequestBody GraphShowInfo graphShowInfo) {
return attributeService.showAttributeInfo(graphShowInfo); return attributeService.showAttributeInfo(graphShowInfo);
} }
@PostMapping("/propertyInfo") @PostMapping("/propertyInfo")
@ApiOperation("属性的详细信息") @Operation(summary = "属性的详细信息")
public List<AttributeVo> showCreateAttributeInfo(@RequestBody GraphShowInfo graphShowInfo) { public List<AttributeVo> showCreateAttributeInfo(@RequestBody GraphShowInfo graphShowInfo) {
return attributeService.showCreateAttributeInfo(graphShowInfo); return attributeService.showCreateAttributeInfo(graphShowInfo);
} }

@ -8,8 +8,8 @@ import com.supervision.nebula.service.AttributeService;
import com.supervision.nebula.service.GraphCommonService; import com.supervision.nebula.service.GraphCommonService;
import com.supervision.nebula.util.NebulaUtil; import com.supervision.nebula.util.NebulaUtil;
import com.supervision.nebula.vo.CommonVo; import com.supervision.nebula.vo.CommonVo;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -23,7 +23,7 @@ import java.util.List;
*/ */
@RestController @RestController
@RequestMapping("/attribute") @RequestMapping("/attribute")
@Api(tags = "属性编辑控制器") @Tag(name = "属性编辑控制器")
@RequiredArgsConstructor @RequiredArgsConstructor
public class AttributeManageController { public class AttributeManageController {
@ -32,19 +32,19 @@ public class AttributeManageController {
private final AttributeService attributeService; private final AttributeService attributeService;
@PostMapping("/dropAttribute") @PostMapping("/dropAttribute")
@ApiOperation("删除属性(删除 space空间 tag标签 edge边类型)") @Operation(summary = "删除属性(删除 space空间 tag标签 edge边类型)")
public List<CommonVo> dropAttribute(@RequestBody GraphDropAttribute graphDropAttribute) { public List<CommonVo> dropAttribute(@RequestBody GraphDropAttribute graphDropAttribute) {
return attributeService.dropAttribute(graphDropAttribute); return attributeService.dropAttribute(graphDropAttribute);
} }
@PostMapping("/addAttributeProperty") @PostMapping("/addAttributeProperty")
@ApiOperation("增加属性的子属性(tag标签的属性 edge边类型的属性)") @Operation(summary = "增加属性的子属性(tag标签的属性 edge边类型的属性)")
public List<CommonVo> addAttributeProperty(@RequestBody GraphAddAttribute graphAddAttribute) { public List<CommonVo> addAttributeProperty(@RequestBody GraphAddAttribute graphAddAttribute) {
return attributeService.addAttributeProperty(graphAddAttribute); return attributeService.addAttributeProperty(graphAddAttribute);
} }
@PostMapping("/delAttributeProperty") @PostMapping("/delAttributeProperty")
@ApiOperation("删除属性的子属性(tag标签的属性 edge边类型的属性)") @Operation(summary = "删除属性的子属性(tag标签的属性 edge边类型的属性)")
public List<CommonVo> delAttributeProperty(@RequestBody GraphDelAttribute graphDelAttribute) { public List<CommonVo> delAttributeProperty(@RequestBody GraphDelAttribute graphDelAttribute) {
return graphCommonService.executeJson(NebulaUtil.delAttributeProperty(graphDelAttribute), CommonVo.class); return graphCommonService.executeJson(NebulaUtil.delAttributeProperty(graphDelAttribute), CommonVo.class);
} }

@ -5,8 +5,8 @@ import com.supervision.nebula.dto.NebulaVertexJsonResult;
import com.supervision.nebula.dto.graph.GraphSpace; import com.supervision.nebula.dto.graph.GraphSpace;
import com.supervision.nebula.service.GraphCommonService; import com.supervision.nebula.service.GraphCommonService;
import com.supervision.nebula.util.NebulaUtil; import com.supervision.nebula.util.NebulaUtil;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -21,7 +21,7 @@ import java.util.List;
* @ClassName: VertexController * @ClassName: VertexController
*/ */
@RestController @RestController
@Api(tags = "边edge查询控制器") @Tag(name = "边edge查询控制器")
@RequestMapping("/edge") @RequestMapping("/edge")
@RequiredArgsConstructor @RequiredArgsConstructor
public class EdgeController { public class EdgeController {
@ -29,7 +29,7 @@ public class EdgeController {
private final GraphCommonService graphCommonService; private final GraphCommonService graphCommonService;
@PostMapping("/listEdge") @PostMapping("/listEdge")
@ApiOperation("查询插入的边edge(绑定关系查询)") @Operation(summary = "查询插入的边edge(绑定关系查询)")
public List<NebulaVertexJsonResult> listEdge(@RequestBody GraphSpace graphSpace) { public List<NebulaVertexJsonResult> listEdge(@RequestBody GraphSpace graphSpace) {
return graphCommonService.executeJson(NebulaUtil.listEdge(graphSpace), NebulaVertexJsonResult.class); return graphCommonService.executeJson(NebulaUtil.listEdge(graphSpace), NebulaVertexJsonResult.class);
} }

@ -6,8 +6,8 @@ import com.supervision.nebula.dto.graph.GraphInsertEdge;
import com.supervision.nebula.service.GraphCommonService; import com.supervision.nebula.service.GraphCommonService;
import com.supervision.nebula.util.NebulaUtil; import com.supervision.nebula.util.NebulaUtil;
import com.supervision.nebula.vo.CommonVo; import com.supervision.nebula.vo.CommonVo;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -22,7 +22,7 @@ import java.util.List;
* @ClassName: VertexController * @ClassName: VertexController
*/ */
@RestController @RestController
@Api(tags = "边edge管理控制器") @Tag(name = "边edge管理控制器")
@RequestMapping("/edge") @RequestMapping("/edge")
@RequiredArgsConstructor @RequiredArgsConstructor
public class EdgeManageController { public class EdgeManageController {
@ -30,14 +30,14 @@ public class EdgeManageController {
private final GraphCommonService graphCommonService; private final GraphCommonService graphCommonService;
@PostMapping("/insertEdge") @PostMapping("/insertEdge")
@ApiOperation("插入边edge(关系编辑-绑定两个点的关系)") @Operation(summary = "插入边edge(关系编辑-绑定两个点的关系)")
public List<CommonVo> insertEdge(@RequestBody GraphInsertEdge graphInsertEdge) { public List<CommonVo> insertEdge(@RequestBody GraphInsertEdge graphInsertEdge) {
String vidType = graphCommonService.getVidType(graphInsertEdge.getSpace()); String vidType = graphCommonService.getVidType(graphInsertEdge.getSpace());
return graphCommonService.executeJson(NebulaUtil.insertEdge(graphInsertEdge, vidType), CommonVo.class); return graphCommonService.executeJson(NebulaUtil.insertEdge(graphInsertEdge, vidType), CommonVo.class);
} }
@PostMapping("/deleteEdge") @PostMapping("/deleteEdge")
@ApiOperation("删除边edge(解除关系编辑-解除两个点的关系)") @Operation(summary = "删除边edge(解除关系编辑-解除两个点的关系)")
public List<CommonVo> deleteEdge(@RequestBody GraphDeleteEdge graphDeleteEdge) { public List<CommonVo> deleteEdge(@RequestBody GraphDeleteEdge graphDeleteEdge) {
String vidType = graphCommonService.getVidType(graphDeleteEdge.getSpace()); String vidType = graphCommonService.getVidType(graphDeleteEdge.getSpace());
return graphCommonService.executeJson(NebulaUtil.deleteEdge(graphDeleteEdge, vidType), CommonVo.class); return graphCommonService.executeJson(NebulaUtil.deleteEdge(graphDeleteEdge, vidType), CommonVo.class);

@ -4,8 +4,8 @@ package com.supervision.nebula.controller;
import com.supervision.nebula.dto.ImportBean; import com.supervision.nebula.dto.ImportBean;
import com.supervision.nebula.entity.GraphFile; import com.supervision.nebula.entity.GraphFile;
import com.supervision.nebula.service.GraphFileService; import com.supervision.nebula.service.GraphFileService;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
@ -21,7 +21,7 @@ import java.io.IOException;
* @since 2022-08-23 09:09:26 * @since 2022-08-23 09:09:26
*/ */
@RestController @RestController
@Api(tags = "文件控制器") @Tag(name = "文件控制器")
@RequestMapping("graphFile") @RequestMapping("graphFile")
public class GraphFileController { public class GraphFileController {
@ -35,19 +35,19 @@ public class GraphFileController {
* @return * @return
*/ */
@ApiOperation("文件上传--可以不做,这里为了预览数据") @Operation(summary = "文件上传--可以不做,这里为了预览数据")
@PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public GraphFile uploadFile(@RequestParam("file") MultipartFile file) { public GraphFile uploadFile(@RequestParam("file") MultipartFile file) {
return this.graphFileService.uploadFile(file); return this.graphFileService.uploadFile(file);
} }
@ApiOperation("文件导入--执行nebula import插件") @Operation(summary = "文件导入--执行nebula import插件")
@PostMapping("/import") @PostMapping("/import")
public Boolean importFile(@RequestBody ImportBean importBean) throws IOException { public Boolean importFile(@RequestBody ImportBean importBean) throws IOException {
return this.graphFileService.importFile(importBean); return this.graphFileService.importFile(importBean);
} }
@ApiOperation("模板下载,可以填充数据") @Operation(summary = "模板下载,可以填充数据")
@GetMapping("/template") @GetMapping("/template")
public void template(@RequestParam String space, HttpServletResponse response) { public void template(@RequestParam String space, HttpServletResponse response) {
graphFileService.template(space, response); graphFileService.template(space, response);

@ -10,8 +10,8 @@ import com.supervision.nebula.util.NebulaUtil;
import com.supervision.nebula.vo.AttributeVo; import com.supervision.nebula.vo.AttributeVo;
import com.supervision.nebula.vo.CommonVo; import com.supervision.nebula.vo.CommonVo;
import com.supervision.nebula.vo.DetailSpace; import com.supervision.nebula.vo.DetailSpace;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -25,7 +25,7 @@ import java.util.List;
* space * space
*/ */
@RestController @RestController
@Api(tags = "图谱space控制器") @Tag(name = "图谱space控制器")
@RequestMapping("/space") @RequestMapping("/space")
@RequiredArgsConstructor @RequiredArgsConstructor
public class SpaceController { public class SpaceController {
@ -36,26 +36,26 @@ public class SpaceController {
@PostMapping("/create") @PostMapping("/create")
@ApiOperation("创建图谱") @Operation(summary = "创建图谱")
public String createSpace(@RequestBody GraphCreateSpace graphCreateSpace) { public String createSpace(@RequestBody GraphCreateSpace graphCreateSpace) {
return spaceService.createSpace(graphCreateSpace); return spaceService.createSpace(graphCreateSpace);
} }
@PostMapping("/use") @PostMapping("/use")
@ApiOperation("切换图谱") @Operation(summary = "切换图谱")
public List<CommonVo> useSpace(@RequestBody GraphCreateSpace graphCreateSpace) { public List<CommonVo> useSpace(@RequestBody GraphCreateSpace graphCreateSpace) {
return graphCommonService.executeJson(NebulaUtil.useSpace(graphCreateSpace.getSpace()), CommonVo.class); return graphCommonService.executeJson(NebulaUtil.useSpace(graphCreateSpace.getSpace()), CommonVo.class);
} }
@PostMapping("/list") @PostMapping("/list")
@ApiOperation("卡片展示列表(图谱详情)") @Operation(summary = "卡片展示列表(图谱详情)")
public List<DetailSpace> detailSpace(@RequestBody GraphShowAttribute graphShowAttribute) { public List<DetailSpace> detailSpace(@RequestBody GraphShowAttribute graphShowAttribute) {
return spaceService.detailSpace(graphShowAttribute); return spaceService.detailSpace(graphShowAttribute);
} }
@PostMapping("/info") @PostMapping("/info")
@ApiOperation("查询某个空间的信息") @Operation(summary = "查询某个空间的信息")
public List<AttributeVo> spaceInfo(@RequestBody GraphSpace graphSpace) { public List<AttributeVo> spaceInfo(@RequestBody GraphSpace graphSpace) {
return spaceService.spaceInfo(graphSpace.getSpace()); return spaceService.spaceInfo(graphSpace.getSpace());
} }

@ -3,15 +3,15 @@ package com.supervision.nebula.controller;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import com.supervision.nebula.service.GraphCommonService; import com.supervision.nebula.service.GraphCommonService;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@Api(tags = "子图查询控制器") @Tag(name = "子图查询控制器")
@RequestMapping("/subGraph") @RequestMapping("/subGraph")
@RequiredArgsConstructor @RequiredArgsConstructor
public class SubGraphController { public class SubGraphController {
@ -19,7 +19,7 @@ public class SubGraphController {
private final GraphCommonService graphCommonService; private final GraphCommonService graphCommonService;
@PostMapping("querySubGraph") @PostMapping("querySubGraph")
@ApiOperation("子图查询") @Operation(summary = "子图查询")
public JSONObject querySubGraph() { public JSONObject querySubGraph() {
String subgraphQuery = "use subgraph;GET SUBGRAPH 100 STEPS FROM \"player101\" YIELD VERTICES AS `vertices_`, EDGES AS `edges_`;"; String subgraphQuery = "use subgraph;GET SUBGRAPH 100 STEPS FROM \"player101\" YIELD VERTICES AS `vertices_`, EDGES AS `edges_`;";
// return JSONUtil.parseObj(s); // return JSONUtil.parseObj(s);

@ -6,8 +6,8 @@ import com.supervision.nebula.dto.graph.GraphCreateTag;
import com.supervision.nebula.service.GraphCommonService; import com.supervision.nebula.service.GraphCommonService;
import com.supervision.nebula.util.NebulaUtil; import com.supervision.nebula.util.NebulaUtil;
import com.supervision.nebula.vo.CommonVo; import com.supervision.nebula.vo.CommonVo;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -21,7 +21,7 @@ import java.util.List;
* tag * tag
*/ */
@RestController @RestController
@Api(tags = "标签tag edge 新增控制器") @Tag(name = "标签tag edge 新增控制器")
@RequestMapping("/tagEdge") @RequestMapping("/tagEdge")
public class TagEdgeController { public class TagEdgeController {
@ -29,20 +29,20 @@ public class TagEdgeController {
GraphCommonService graphCommonService; GraphCommonService graphCommonService;
@PostMapping("/createTag") @PostMapping("/createTag")
@ApiOperation("创建tag") @Operation(summary = "创建tag")
public List<CommonVo> createTagEdge(@RequestBody GraphCreateTag graphCreateTag) { public List<CommonVo> createTagEdge(@RequestBody GraphCreateTag graphCreateTag) {
return graphCommonService.executeJson(NebulaUtil.createTag(graphCreateTag), CommonVo.class); return graphCommonService.executeJson(NebulaUtil.createTag(graphCreateTag), CommonVo.class);
} }
@PostMapping("/createEdge") @PostMapping("/createEdge")
@ApiOperation("创建edge") @Operation(summary = "创建edge")
public List<CommonVo> createEdge(@RequestBody GraphCreateTag graphCreateTag) { public List<CommonVo> createEdge(@RequestBody GraphCreateTag graphCreateTag) {
return graphCommonService.executeJson(NebulaUtil.createEdge(graphCreateTag), CommonVo.class); return graphCommonService.executeJson(NebulaUtil.createEdge(graphCreateTag), CommonVo.class);
} }
@PostMapping("/createIndex") @PostMapping("/createIndex")
@ApiOperation("创建索引") @Operation(summary = "创建索引")
public List<CommonVo> createIndex(@RequestBody GraphCreateIndex graphCreateIndex) { public List<CommonVo> createIndex(@RequestBody GraphCreateIndex graphCreateIndex) {
return graphCommonService.executeJson(NebulaUtil.createIndex(graphCreateIndex), CommonVo.class); return graphCommonService.executeJson(NebulaUtil.createIndex(graphCreateIndex), CommonVo.class);
} }

@ -7,8 +7,8 @@ import com.supervision.nebula.dto.NebulaVertexJsonResult;
import com.supervision.nebula.dto.graph.*; import com.supervision.nebula.dto.graph.*;
import com.supervision.nebula.service.VertexService; import com.supervision.nebula.service.VertexService;
import com.supervision.nebula.vo.AttributeVo; import com.supervision.nebula.vo.AttributeVo;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -25,7 +25,7 @@ import java.util.Map;
* @author fulin * @author fulin
*/ */
@RestController @RestController
@Api(tags = "点查询(实体)控制器") @Tag(name = "点查询(实体)控制器")
@RequestMapping("/vertex") @RequestMapping("/vertex")
@RequiredArgsConstructor @RequiredArgsConstructor
public class VertexController { public class VertexController {
@ -33,25 +33,25 @@ public class VertexController {
private final VertexService vertexService; private final VertexService vertexService;
@PostMapping("/vertexList") @PostMapping("/vertexList")
@ApiOperation("查询创建的点列表") @Operation(summary = "查询创建的点列表")
public List<NebulaVertexJsonResult> vertexList(@RequestBody GraphSpace graphSpace) { public List<NebulaVertexJsonResult> vertexList(@RequestBody GraphSpace graphSpace) {
return vertexService.vertexList(graphSpace.getSpace()); return vertexService.vertexList(graphSpace.getSpace());
} }
@PostMapping("/vertexTagsQuery") @PostMapping("/vertexTagsQuery")
@ApiOperation("根据tag标签查询点") @Operation(summary = "根据tag标签查询点")
public List<NebulaVertexJsonResult> vertexTagsQuery(@RequestBody GraphVertexTatsQuery graphVertexTatsQuery) { public List<NebulaVertexJsonResult> vertexTagsQuery(@RequestBody GraphVertexTatsQuery graphVertexTatsQuery) {
return vertexService.vertexTagsQuery(graphVertexTatsQuery); return vertexService.vertexTagsQuery(graphVertexTatsQuery);
} }
@PostMapping("/vertexTagAttributeQuery") @PostMapping("/vertexTagAttributeQuery")
@ApiOperation("根据tag标签属性查询点(先要保证该标签属性已经建立索引)") @Operation(summary = "根据tag标签属性查询点(先要保证该标签属性已经建立索引)")
public List<NebulaVertexJsonResult> vertexTagAttributeQuery(@RequestBody GraphVertexTatAttributeQuery graphVertexTatAttributeQuery) { public List<NebulaVertexJsonResult> vertexTagAttributeQuery(@RequestBody GraphVertexTatAttributeQuery graphVertexTatAttributeQuery) {
return vertexService.vertexTagAttributeQuery(graphVertexTatAttributeQuery); return vertexService.vertexTagAttributeQuery(graphVertexTatAttributeQuery);
} }
@PostMapping("/expandQuery") @PostMapping("/expandQuery")
@ApiOperation("根据点以及边信息扩展查询") @Operation(summary = "根据点以及边信息扩展查询")
public GraphData vertexExpandQuery(@RequestBody GraphExpand graphExpand) { public GraphData vertexExpandQuery(@RequestBody GraphExpand graphExpand) {
List<NebulaVertexJsonResult> data = vertexService.vertexExpandQuery(graphExpand); List<NebulaVertexJsonResult> data = vertexService.vertexExpandQuery(graphExpand);
JSONArray objects = JSONUtil.parseArray(JSONUtil.toJsonStr(data)); JSONArray objects = JSONUtil.parseArray(JSONUtil.toJsonStr(data));
@ -59,7 +59,7 @@ public class VertexController {
} }
@PostMapping("/page") @PostMapping("/page")
@ApiOperation("查询创建的点分页列表") @Operation(summary = "查询创建的点分页列表")
public Map<String, Object> vertexPage(@RequestBody GraphVertexTatsQuery graphVertexTatsQuery) { public Map<String, Object> vertexPage(@RequestBody GraphVertexTatsQuery graphVertexTatsQuery) {
return vertexService.vertexPage(graphVertexTatsQuery); return vertexService.vertexPage(graphVertexTatsQuery);
} }

@ -6,8 +6,8 @@ import com.supervision.nebula.dto.graph.GraphInsertVertex;
import com.supervision.nebula.service.GraphCommonService; import com.supervision.nebula.service.GraphCommonService;
import com.supervision.nebula.util.NebulaUtil; import com.supervision.nebula.util.NebulaUtil;
import com.supervision.nebula.vo.CommonVo; import com.supervision.nebula.vo.CommonVo;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -21,7 +21,7 @@ import java.util.List;
* *
*/ */
@RestController @RestController
@Api(tags = "点编辑(实体)控制器") @Tag(name = "点编辑(实体)控制器")
@RequestMapping("/vertex") @RequestMapping("/vertex")
@RequiredArgsConstructor @RequiredArgsConstructor
public class VertexManageController { public class VertexManageController {
@ -29,14 +29,14 @@ public class VertexManageController {
private final GraphCommonService graphCommonService; private final GraphCommonService graphCommonService;
@PostMapping("/createVertex") @PostMapping("/createVertex")
@ApiOperation("创建点(需要附加标签tag信息)") @Operation(summary = "创建点(需要附加标签tag信息)")
public List<CommonVo> createVertex(@RequestBody GraphInsertVertex graphInsertVertex) { public List<CommonVo> createVertex(@RequestBody GraphInsertVertex graphInsertVertex) {
String vidType = graphCommonService.getVidType(graphInsertVertex.getSpace()); String vidType = graphCommonService.getVidType(graphInsertVertex.getSpace());
return graphCommonService.executeJson(NebulaUtil.insertVertex(graphInsertVertex, vidType), CommonVo.class); return graphCommonService.executeJson(NebulaUtil.insertVertex(graphInsertVertex, vidType), CommonVo.class);
} }
@PostMapping("/deleteVertex") @PostMapping("/deleteVertex")
@ApiOperation("删除点(根据点id删除)") @Operation(summary = "删除点(根据点id删除)")
public List<CommonVo> deleteVertex(@RequestBody GraphDeleteVertex graphDeleteVertex) { public List<CommonVo> deleteVertex(@RequestBody GraphDeleteVertex graphDeleteVertex) {
String vidType = graphCommonService.getVidType(graphDeleteVertex.getSpace()); String vidType = graphCommonService.getVidType(graphDeleteVertex.getSpace());
return graphCommonService.executeJson(NebulaUtil.deleteVertex(graphDeleteVertex, vidType), CommonVo.class); return graphCommonService.executeJson(NebulaUtil.deleteVertex(graphDeleteVertex, vidType), CommonVo.class);

@ -1,23 +1,23 @@
package com.supervision.nebula.dto; package com.supervision.nebula.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
/** /**
* @ClassName: ImportDto * @ClassName: ImportDto
*/ */
@Data @Data
@ApiModel("数据导入入参") @Schema(name = "数据导入入参")
public class ImportDto { public class ImportDto {
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
@ApiModelProperty(value = "attribute可选值: tag标签/edge边类型", example = "tag", required = true) @Schema(name = "attribute可选值: tag标签/edge边类型", example = "tag", required = true)
private String attribute; private String attribute;
@ApiModelProperty(value = "属性名称", example = "t1", required = true) @Schema(name = "属性名称", example = "t1", required = true)
private String attributeName; private String attributeName;
} }

@ -2,8 +2,7 @@ package com.supervision.nebula.dto;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -18,15 +17,15 @@ import java.util.Set;
* @author fulin by 2022/3/29 * @author fulin by 2022/3/29
*/ */
@Data @Data
@ApiModel("返回类") @Schema(name = "返回类")
public class NebulaVertexJsonResult { public class NebulaVertexJsonResult {
@ApiModelProperty(value = "空间名称") @Schema(name = "空间名称")
private String spaceName; private String spaceName;
@ApiModelProperty(value = "潜伏期") @Schema(name = "潜伏期")
private int latencyInUs; private int latencyInUs;
@ApiModelProperty(value = "数据集合") @Schema(name = "数据集合")
private List<OneData> data; private List<OneData> data;
@ApiModelProperty(value = "字段") @Schema(name = "字段")
private List<String> columns; private List<String> columns;
public Set<FailureTroubleshootingVo> toFailureTroubleshootingVos() { public Set<FailureTroubleshootingVo> toFailureTroubleshootingVos() {
@ -57,17 +56,17 @@ public class NebulaVertexJsonResult {
@Data @Data
public static class OneData { public static class OneData {
@ApiModelProperty(value = "元数据") @Schema(name = "元数据")
private List<OneMeta> meta; private List<OneMeta> meta;
@ApiModelProperty(value = "属性名称: 属性值") @Schema(name = "属性名称: 属性值")
private List<LinkedHashMap<String, String>> row; private List<LinkedHashMap<String, String>> row;
} }
@Data @Data
public static class OneMeta { public static class OneMeta {
@ApiModelProperty(value = "id") @Schema(name = "id")
private String id; private String id;
@ApiModelProperty(value = "类型") @Schema(name = "类型")
private String type; private String type;
} }
} }

@ -1,20 +1,20 @@
package com.supervision.nebula.dto; package com.supervision.nebula.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
/** /**
* @Descriptin: * @Descriptin:
* @ClassName: PageBeanDto * @ClassName: PageBeanDto
*/ */
@ApiModel("分页参数入参") @Schema(name = "分页参数入参")
@Data @Data
public class PageBeanDto { public class PageBeanDto {
@ApiModelProperty(value = "页码:从1开始", example = "1", required = false) @Schema(name = "页码:从1开始", example = "1", required = false)
private Integer pageNum = 1; private Integer pageNum = 1;
@ApiModelProperty(value = "分页条数", example = "10", required = false) @Schema(name = "分页条数", example = "10", required = false)
private Integer pageSize = 10; private Integer pageSize = 10;
} }

@ -1,27 +1,26 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
* @Descriptin: * @Descriptin:
* @ClassName: AttributeBean * @ClassName: AttributeBean
*/ */
@ApiModel("属性入参") @Schema(name = "属性入参")
@Data @Data
public class AttributeBean { public class AttributeBean {
/** /**
* *
**/ **/
@ApiModelProperty(value = "tag/edge的属性名称", example = "p3", required = true) @Schema(name = "tag/edge的属性名称", example = "p3", required = true)
private String propertyName; private String propertyName;
/** /**
* (int bool string double .........) * (int bool string double .........)
**/ **/
@ApiModelProperty(value = "索引长度:属性为string 必须有长度,其他类型不可传入 ", example = "30", required = true) @Schema(name = "索引长度:属性为string 必须有长度,其他类型不可传入 ", example = "30", required = true)
private String indexLength; private String indexLength;
public String getPropertyName() { public String getPropertyName() {

@ -2,8 +2,7 @@ package com.supervision.nebula.dto.graph;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -13,32 +12,32 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("修改属性实体") @Schema(name = "修改属性实体")
public class GraphAddAttribute { public class GraphAddAttribute {
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
@ApiModelProperty(value = "attribute可选值: tag标签/edge边类型", example = "tag", required = true) @Schema(name = "attribute可选值: tag标签/edge边类型", example = "tag", required = true)
private String attribute; private String attribute;
@ApiModelProperty(value = "属性名称", example = "t1", required = true) @Schema(name = "属性名称", example = "t1", required = true)
private String attributeName; private String attributeName;
@ApiModelProperty(value = "tag/edge的属性名称", example = "p5") @Schema(name = "tag/edge的属性名称", example = "p5")
private String propertyName; private String propertyName;
@ApiModelProperty(value = "属性类型,add 必传该类型 可选值: int bool string double .........", example = "string", required = false) @Schema(name = "属性类型,add 必传该类型 可选值: int bool string double .........", example = "string", required = false)
private String propertyType; private String propertyType;
@ApiModelProperty(value = "是否可为空: NOT NULL 或者 NULL", example = "NULL") @Schema(name = "是否可为空: NOT NULL 或者 NULL", example = "NULL")
private String isNull; private String isNull;
@ApiModelProperty(value = "默认值") @Schema(name = "默认值")
private Object defaultValue; private Object defaultValue;
@ApiModelProperty(value = "描述") @Schema(name = "描述")
private String common; private String common;
public Object getDefaultValue() { public Object getDefaultValue() {

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -13,27 +13,27 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("创建tag edge入参") @Schema(name = "创建tag edge入参")
public class GraphCreateEdge { public class GraphCreateEdge {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi") @Schema(name = "空间名称", example = "flceshi")
private String space; private String space;
@ApiModelProperty(value = "创建类型: tag/edge", example = "tag") @Schema(name = "创建类型: tag/edge", example = "tag")
private String type; private String type;
@ApiModelProperty(value = "tag/edge名称", example = "demo") @Schema(name = "tag/edge名称", example = "demo")
private String tagEdgeName; private String tagEdgeName;
@ApiModelProperty(value = "tag/edge描述", example = "备注") @Schema(name = "tag/edge描述", example = "备注")
private String tagEdgeComment; private String tagEdgeComment;
@ApiModelProperty(value = "属性集合") @Schema(name = "属性集合")
private List<PropertyBean> propertyList; private List<PropertyBean> propertyList;
@ApiModelProperty(value = "颜色") @Schema(name = "颜色")
private String color; private String color;
} }

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -13,27 +13,27 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("创建索引入参") @Schema(name = "创建索引入参")
public class GraphCreateIndex { public class GraphCreateIndex {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi")
private String space; private String space;
@ApiModelProperty(value = "创建类型: tag/edge", example = "tag", required = true) @Schema(name = "创建类型: tag/edge", example = "tag")
private String type; private String type;
@ApiModelProperty(value = "索引名称", example = "name_index", required = true) @Schema(name = "索引名称", example = "name_index")
private String indexName; private String indexName;
@ApiModelProperty(value = "tag/edge名称", example = "t1", required = true) @Schema(name = "tag/edge名称", example = "t1")
private String tagEdgeName; private String tagEdgeName;
@ApiModelProperty(value = "索引描述描述", example = "备注") @Schema(name = "索引描述描述", example = "备注")
private String comment; private String comment;
@ApiModelProperty(value = "属性集合") @Schema(name = "属性集合")
private List<AttributeBean> attributeBeanList; private List<AttributeBean> attributeBeanList;
} }

@ -1,8 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -12,45 +11,45 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("创建空间实体") @Schema(name = "创建空间实体")
public class GraphCreateSpace { public class GraphCreateSpace {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间中文名称", example = "付琳测试", required = true) @Schema(name = "空间中文名称", example = "付琳测试", required = true)
private String spaceChineseName; private String spaceChineseName;
/** /**
* *
**/ **/
@ApiModelProperty(value = "分片数量", example = "1") @Schema(name = "分片数量", example = "1")
private Integer partitionNum; private Integer partitionNum;
/** /**
* *
**/ **/
@ApiModelProperty(value = "副本数量", example = "1") @Schema(name = "副本数量", example = "1")
private Integer replicaFactor; private Integer replicaFactor;
/** /**
* *
**/ **/
@ApiModelProperty(value = "点类型:INT64,FIXED_STRING", example = "INT64") @Schema(name = "点类型:INT64,FIXED_STRING", example = "INT64")
private String fixedType = "INT64"; private String fixedType = "INT64";
/** /**
* *
**/ **/
@ApiModelProperty(value = "类型长度,FIXED_STRING 此字段必填 如32,64") @Schema(name = "类型长度,FIXED_STRING 此字段必填 如32,64")
private String size = ""; private String size = "";
/** /**
* *
**/ **/
@ApiModelProperty(value = "描述") @Schema(name = "描述")
private String comment; private String comment;
public String getSize() { public String getSize() {

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -13,24 +13,24 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("创建tag edge入参") @Schema(name = "创建tag edge入参")
public class GraphCreateTag { public class GraphCreateTag {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi") @Schema(name = "空间名称", example = "flceshi")
private String space; private String space;
@ApiModelProperty(value = "tag/edge名称", example = "demo") @Schema(name = "tag/edge名称", example = "demo")
private String tagEdgeName; private String tagEdgeName;
@ApiModelProperty(value = "tag/edge描述", example = "备注") @Schema(name = "tag/edge描述", example = "备注")
private String tagEdgeComment; private String tagEdgeComment;
@ApiModelProperty(value = "属性集合") @Schema(name = "属性集合")
private List<PropertyBean> propertyList; private List<PropertyBean> propertyList;
@ApiModelProperty(value = "颜色") @Schema(name = "颜色")
private String color; private String color;
} }

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -13,19 +13,19 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("删除属性实体") @Schema(name = "删除属性实体")
public class GraphDelAttribute { public class GraphDelAttribute {
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
@ApiModelProperty(value = "attribute可选值: tag标签/edge边类型", example = "tag", required = true) @Schema(name = "attribute可选值: tag标签/edge边类型", example = "tag", required = true)
private String attribute; private String attribute;
@ApiModelProperty(value = "属性名称", example = "t1", required = true) @Schema(name = "属性名称", example = "t1", required = true)
private String attributeName; private String attributeName;
@ApiModelProperty(value = "tag/edge的属性名称 支持批量") @Schema(name = "tag/edge的属性名称 支持批量")
private List<String> propertyNameList; private List<String> propertyNameList;
} }

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -11,22 +11,22 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("删除边入参") @Schema(name = "删除边入参")
public class GraphDeleteEdge { public class GraphDeleteEdge {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
@ApiModelProperty(value = "边类型edge名称", example = "e1", required = true) @Schema(name = "边类型edge名称", example = "e1", required = true)
private String edgeName; private String edgeName;
@ApiModelProperty(value = "点的起始VID", example = "11", required = true) @Schema(name = "点的起始VID", example = "11", required = true)
private Object srcVid; private Object srcVid;
@ApiModelProperty(value = "点的目的VID", example = "12", required = true) @Schema(name = "点的目的VID", example = "12", required = true)
private Object dstVid; private Object dstVid;
} }

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -11,13 +11,13 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("删除空间实体") @Schema(name = "删除空间实体")
public class GraphDeleteSpace { public class GraphDeleteSpace {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -11,16 +11,16 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("删除点入参") @Schema(name = "删除点入参")
public class GraphDeleteVertex { public class GraphDeleteVertex {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
@ApiModelProperty(value = "vertex 点id", required = true) @Schema(name = "vertex 点id", required = true)
private Object vid; private Object vid;
} }

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -11,16 +11,16 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("删除属性实体") @Schema(name = "删除属性实体")
public class GraphDropAttribute { public class GraphDropAttribute {
@ApiModelProperty(value = "空间名称", example = "flceshi1", required = true) @Schema(name = "空间名称", example = "flceshi1", required = true)
private String space; private String space;
@ApiModelProperty(value = "属性名称", example = "flceshi1", required = true) @Schema(name = "属性名称", example = "flceshi1", required = true)
private String attributeName; private String attributeName;
@ApiModelProperty(value = "attribute可选值:space空间/tag标签/edge边类型", example = "space", required = true) @Schema(name = "attribute可选值:space空间/tag标签/edge边类型", example = "space", required = true)
private String attribute; private String attribute;
} }

@ -1,8 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Min;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@ -16,35 +15,35 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("扩展查询入参实体") @Schema(name = "扩展查询入参实体")
public class GraphExpand { public class GraphExpand {
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
@ApiModelProperty(value = "边类型集合", required = true) @Schema(name = "边类型集合", required = true)
private List<String> edgeList; private List<String> edgeList;
@ApiModelProperty(value = "方向: OUTFLOW(流出);INFLOW(流入);TWO-WAY(双向);", example = "TWO-WAY", required = true) @Schema(name = "方向: OUTFLOW(流出);INFLOW(流入);TWO-WAY(双向);", example = "TWO-WAY", required = true)
private String direction; private String direction;
@ApiModelProperty(value = "步数开始(单步/范围的开始)", example = "1", required = true) @Schema(name = "步数开始(单步/范围的开始)", example = "1", required = true)
private Integer stepStart; private Integer stepStart;
@ApiModelProperty(value = "步数结束(范围的结束;可无)", example = "2") @Schema(name = "步数结束(范围的结束;可无)", example = "2")
@Min(1) @Min(1)
private Integer stepEnd; private Integer stepEnd;
@ApiModelProperty(value = "结果条数", example = "100", required = true) @Schema(name = "结果条数", example = "100", required = true)
@Max(Integer.MAX_VALUE) @Max(Integer.MAX_VALUE)
@Min(1) @Min(1)
private Integer resultSize = Integer.MAX_VALUE; private Integer resultSize = Integer.MAX_VALUE;
@ApiModelProperty(value = "扩展点id集合", required = true) @Schema(name = "扩展点id集合", required = true)
private List<Object> vidList; private List<Object> vidList;
@ApiModelProperty(value = "条件(可为空)", example = " l.name CONTAINS '1' ", required = false) @Schema(name = "条件(可为空)", example = " l.name CONTAINS '1' ", required = false)
private String condition; private String condition;
public String getStepEndResult() { public String getStepEndResult() {

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -13,27 +13,27 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("插入边入参") @Schema(name = "插入边入参")
public class GraphInsertEdge { public class GraphInsertEdge {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
@ApiModelProperty(value = "边类型edge名称", example = "e1", required = true) @Schema(name = "边类型edge名称", example = "e1", required = true)
private String edgeName; private String edgeName;
@ApiModelProperty(value = "边类型edge属性集合", required = false) @Schema(name = "边类型edge属性集合", required = false)
private List<String> edgeList; private List<String> edgeList;
@ApiModelProperty(value = "点的起始VID", example = "11", required = true) @Schema(name = "点的起始VID", example = "11", required = true)
private String srcVid; private String srcVid;
@ApiModelProperty(value = "点的目的VID", example = "12", required = true) @Schema(name = "点的目的VID", example = "12", required = true)
private String dstVid; private String dstVid;
@ApiModelProperty(value = "边edge的属性值集合", required = false) @Schema(name = "边edge的属性值集合", required = false)
private List<Object> edgeValueList; private List<Object> edgeValueList;
} }

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -13,24 +13,24 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("创建点入参") @Schema(name = "创建点入参")
public class GraphInsertVertex { public class GraphInsertVertex {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
@ApiModelProperty(value = "标签tag名称", example = "t1", required = true) @Schema(name = "标签tag名称", example = "t1", required = true)
private String tagName; private String tagName;
@ApiModelProperty(value = "标签tag属性集合", required = false) @Schema(name = "标签tag属性集合", required = false)
private List<String> tagList; private List<String> tagList;
@ApiModelProperty(value = "点的VID", required = true) @Schema(name = "点的VID", required = true)
private Object tagVid; private Object tagVid;
@ApiModelProperty(value = "标签tag的属性值集合", required = false) @Schema(name = "标签tag的属性值集合", required = false)
private List<Object> tagValueList; private List<Object> tagValueList;
} }

@ -1,8 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import com.supervision.nebula.dto.PageBeanDto; import com.supervision.nebula.dto.PageBeanDto;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -12,13 +11,13 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("查询属性分页查询入参") @Schema(name = "查询属性分页查询入参")
public class GraphPageAttribute extends PageBeanDto { public class GraphPageAttribute extends PageBeanDto {
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
@ApiModelProperty(value = "attribute可选值:tags标签/edges边类型", example = "tags", required = true) @Schema(name = "attribute可选值:tags标签/edges边类型", example = "tags", required = true)
private String attribute; private String attribute;
} }

@ -1,8 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import com.supervision.nebula.dto.PageBeanDto; import com.supervision.nebula.dto.PageBeanDto;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -12,20 +11,20 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("查询边分页入参") @Schema(name = "查询边分页入参")
public class GraphPageEdge extends PageBeanDto { public class GraphPageEdge extends PageBeanDto {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi")
private String space; private String space;
@ApiModelProperty(value = "边类型edge", required = false) @Schema(name = "边类型edge")
private String edge; private String edge;
@ApiModelProperty(value = "起点或者终点ID", required = false) @Schema(name = "起点或者终点ID")
private String vid; private String vid;
} }

@ -1,6 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
/** /**
@ -11,15 +12,15 @@ import lombok.Data;
@Data @Data
public class GraphRelationInsert { public class GraphRelationInsert {
@ApiModelProperty(value = "空间名称", example = "movies", required = true) @Schema(name = "空间名称", example = "movies", required = true)
private String space; private String space;
@ApiModelProperty(value = "开始标签", required = true) @Schema(name = "开始标签", required = true)
private String tagStart; private String tagStart;
@ApiModelProperty(value = "边类型", required = true) @Schema(name = "边类型", required = true)
private String edge; private String edge;
@ApiModelProperty(value = "结束标签", required = true) @Schema(name = "结束标签", required = true)
private String tagEnd; private String tagEnd;
} }

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -11,18 +11,18 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("查询相关属性入参") @Schema(name = "查询相关属性入参")
public class GraphShowAttribute { public class GraphShowAttribute {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi", required = false) @Schema(name = "空间名称", example = "flceshi", required = false)
private String space; private String space;
/** /**
* attributes: spaces/tags/edges * attributes: spaces/tags/edges
**/ **/
@ApiModelProperty(value = "attribute可选值:spaces空间/tags标签/edges边类型", example = "spaces", required = true) @Schema(name = "attribute可选值:spaces空间/tags标签/edges边类型", example = "spaces", required = true)
private String attribute; private String attribute;
} }

@ -1,8 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import com.supervision.nebula.dto.PageBeanDto; import com.supervision.nebula.dto.PageBeanDto;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ -10,18 +9,18 @@ import lombok.*;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("查询索引入参") @Schema(name = "查询索引入参")
public class GraphShowIndex extends PageBeanDto { public class GraphShowIndex extends PageBeanDto {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
/** /**
* attribute: tag/edge * attribute: tag/edge
**/ **/
@ApiModelProperty(value = "属性可选: tag/edge/fulltext", example = "tag", required = true) @Schema(name = "属性可选: tag/edge/fulltext", example = "tag", required = true)
private String attribute; private String attribute;
} }

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -11,25 +11,25 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("属性详情查询入参") @Schema(name = "属性详情查询入参")
public class GraphShowInfo { public class GraphShowInfo {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi") @Schema(name = "空间名称", example = "flceshi")
private String space; private String space;
/** /**
* attribute: tag /edge * attribute: tag /edge
**/ **/
@ApiModelProperty(value = "属性类型:tag/edge", example = "tag") @Schema(name = "属性类型:tag/edge", example = "tag")
private String attribute; private String attribute;
/** /**
* attributeName: tag /edge * attributeName: tag /edge
**/ **/
@ApiModelProperty(value = "属性名称") @Schema(name = "属性名称")
private String attributeName; private String attributeName;
} }

@ -2,8 +2,7 @@ package com.supervision.nebula.dto.graph;
import com.supervision.nebula.dto.PageBeanDto; import com.supervision.nebula.dto.PageBeanDto;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -13,9 +12,9 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("通用入参实体") @Schema(name = "通用入参实体")
public class GraphSpace extends PageBeanDto { public class GraphSpace extends PageBeanDto {
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
} }

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -13,28 +13,28 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("修改边入参") @Schema(name = "修改边入参")
public class GraphUpdateEdge { public class GraphUpdateEdge {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
@ApiModelProperty(value = "边类型edge名称", example = "e1", required = true) @Schema(name = "边类型edge名称", example = "e1", required = true)
private String edgeName; private String edgeName;
@ApiModelProperty(value = "边类型edge属性集合", required = false) @Schema(name = "边类型edge属性集合", required = false)
private List<String> edgeList; private List<String> edgeList;
@ApiModelProperty(value = "点的起始VID", required = true) @Schema(name = "点的起始VID", required = true)
private Object srcVid; private Object srcVid;
@ApiModelProperty(value = "点的目的VID", required = true) @Schema(name = "点的目的VID", required = true)
private Object dstVid; private Object dstVid;
@ApiModelProperty(value = "边edge的属性值集合", required = false) @Schema(name = "边edge的属性值集合", required = false)
private List<Object> edgeValueList; private List<Object> edgeValueList;
} }

@ -1,8 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -12,15 +11,15 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("修改空间备注入参实体") @Schema(name = "修改空间备注入参实体")
public class GraphUpdateSpace { public class GraphUpdateSpace {
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
@ApiModelProperty(value = "空间中文名称", example = "空间中文名称", required = true) @Schema(name = "空间中文名称", example = "空间中文名称", required = true)
private String spaceChineseName; private String spaceChineseName;
@ApiModelProperty(value = "空间备注", example = "备注信息", required = true) @Schema(name = "空间备注", example = "备注信息", required = true)
private String spaceComment; private String spaceComment;
} }

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -11,21 +11,21 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("修改tag颜色入参") @Schema(name = "修改tag颜色入参")
public class GraphUpdateTagColor { public class GraphUpdateTagColor {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi") @Schema(name = "空间名称", example = "flceshi")
private String space; private String space;
@ApiModelProperty(value = "类型: tag/edge", example = "tag") @Schema(name = "类型: tag/edge", example = "tag")
private String type; private String type;
@ApiModelProperty(value = "tag/edge名称", example = "demo") @Schema(name = "tag/edge名称", example = "demo")
private String tagEdgeName; private String tagEdgeName;
@ApiModelProperty(value = "颜色") @Schema(name = "颜色")
private String color; private String color;
} }

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -13,26 +13,26 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("修改点入参") @Schema(name = "修改点入参")
public class GraphUpdateVertex { public class GraphUpdateVertex {
/** /**
* *
**/ **/
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
@ApiModelProperty(value = "标签tag名称", example = "t1", required = true) @Schema(name = "标签tag名称", example = "t1", required = true)
private String tagName; private String tagName;
@ApiModelProperty(value = "标签tag属性集合", required = true) @Schema(name = "标签tag属性集合", required = true)
private List<String> tagList; private List<String> tagList;
/** /**
* pointkey * pointkey
**/ **/
@ApiModelProperty(value = "点的VID", example = "11", required = true) @Schema(name = "点的VID", example = "11", required = true)
private Object pointKey; private Object pointKey;
@ApiModelProperty(value = "标签tag的属性值集合", required = true) @Schema(name = "标签tag的属性值集合", required = true)
private List<Object> tagValueList; private List<Object> tagValueList;
} }

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -13,12 +13,12 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("归因分析查询入参") @Schema(name = "归因分析查询入参")
public class GraphVertexAnalysisResult { public class GraphVertexAnalysisResult {
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi")
private String space; private String space;
@ApiModelProperty(value = "查询关键字集合", required = true) @Schema(name = "查询关键字集合")
private List<String> wordList; private List<String> wordList;
} }

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -11,12 +11,12 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("解析文字入参") @Schema(name = "解析文字入参")
public class GraphVertexAnalysisWord { public class GraphVertexAnalysisWord {
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
@ApiModelProperty(value = "查询关键字", required = true) @Schema(name = "查询关键字", required = true)
private String word; private String word;
} }

@ -1,7 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -13,18 +13,18 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("全文检索") @Schema(name = "全文检索")
public class GraphVertexFullQuery { public class GraphVertexFullQuery {
@ApiModelProperty(value = "空间名称", example = "movies", required = true) @Schema(name = "空间名称", example = "movies", required = true)
private String space; private String space;
@ApiModelProperty(value = "查询关键字", required = true) @Schema(name = "查询关键字", required = true)
private String word; private String word;
@ApiModelProperty(value = "标签集合", required = false) @Schema(name = "标签集合", required = false)
private List<String> tagList; private List<String> tagList;
@ApiModelProperty(value = "查询最大条数", required = true) @Schema(name = "查询最大条数", required = true)
private Integer resultSize; private Integer resultSize;
} }

@ -1,8 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -14,34 +13,34 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("路径检索") @Schema(name = "路径检索")
public class GraphVertexPathQuery { public class GraphVertexPathQuery {
@ApiModelProperty(value = "空间名称", example = "movies", required = true) @Schema(name = "空间名称", example = "movies", required = true)
private String space; private String space;
@ApiModelProperty(value = "路径查找类型: SHORTEST最短 | ALL所有 | NOLOOP非循环", example = "ALL", required = true) @Schema(name = "路径查找类型: SHORTEST最短 | ALL所有 | NOLOOP非循环", example = "ALL", required = true)
private String pathType; private String pathType;
@ApiModelProperty(value = "变类型集合", required = true) @Schema(name = "变类型集合", required = true)
private List<String> edgeList; private List<String> edgeList;
@ApiModelProperty(value = "点的起始VID", required = true) @Schema(name = "点的起始VID", required = true)
private List<Object> srcVid; private List<Object> srcVid;
@ApiModelProperty(value = "点的目的VID", required = true) @Schema(name = "点的目的VID", required = true)
private List<Object> dstVid; private List<Object> dstVid;
@ApiModelProperty(value = "查询方向: REVERSELY反向 | BIDIRECT双向 | 空 正向", example = "BIDIRECT", required = true) @Schema(name = "查询方向: REVERSELY反向 | BIDIRECT双向 | 空 正向", example = "BIDIRECT", required = true)
private String direct; private String direct;
@ApiModelProperty(value = "最大步数", example = "3", required = true) @Schema(name = "最大步数", example = "3", required = true)
private Integer step; private Integer step;
@ApiModelProperty(value = "查询最大条数", required = true) @Schema(name = "查询最大条数", required = true)
private Integer resultSize; private Integer resultSize;
@ApiModelProperty(value = "筛选条件", required = true) @Schema(name = "筛选条件", required = true)
private String condition; private String condition;
public String getEdgeList() { public String getEdgeList() {

@ -1,8 +1,7 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Min;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@ -15,19 +14,19 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("根据tag标签查询点入参实体") @Schema(name = "根据tag标签查询点入参实体")
public class GraphVertexTatAttributeQuery { public class GraphVertexTatAttributeQuery {
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
@ApiModelProperty(value = "标签", example = "t1", required = true) @Schema(name = "标签", example = "t1", required = true)
private String tag; private String tag;
@ApiModelProperty(value = "执行条件", required = true) @Schema(name = "执行条件", required = true)
private String condition; private String condition;
@ApiModelProperty(value = "结果条数", example = "100", required = true) @Schema(name = "结果条数", example = "100", required = true)
@Max(Integer.MAX_VALUE) @Max(Integer.MAX_VALUE)
@Min(1) @Min(1)
private Integer resultSize = Integer.MAX_VALUE; private Integer resultSize = Integer.MAX_VALUE;

@ -2,8 +2,7 @@ package com.supervision.nebula.dto.graph;
import com.supervision.nebula.dto.PageBeanDto; import com.supervision.nebula.dto.PageBeanDto;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -13,15 +12,15 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ApiModel("根据tag标签查询点入参实体") @Schema(name = "根据tag标签查询点入参实体")
public class GraphVertexTatsQuery extends PageBeanDto { public class GraphVertexTatsQuery extends PageBeanDto {
@ApiModelProperty(value = "空间名称", example = "flceshi", required = true) @Schema(name = "空间名称", example = "flceshi", required = true)
private String space; private String space;
@ApiModelProperty(value = "标签", required = false) @Schema(name = "标签", required = false)
private String tag; private String tag;
@ApiModelProperty(value = "点id", required = false) @Schema(name = "点id", required = false)
private Object pointKey; private Object pointKey;
} }

@ -1,44 +1,43 @@
package com.supervision.nebula.dto.graph; package com.supervision.nebula.dto.graph;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
* @Descriptin: * @Descriptin:
* @ClassName: PropertyBean * @ClassName: PropertyBean
*/ */
@ApiModel("属性实体") @Schema(name = "属性实体")
@Data @Data
public class PropertyBean { public class PropertyBean {
/** /**
* *
**/ **/
@ApiModelProperty(value = "tag/edge属性名称", example = "name", required = true) @Schema(name = "tag/edge属性名称", example = "name", required = true)
private String propertyName; private String propertyName;
/** /**
* (int bool string double .........) * (int bool string double .........)
**/ **/
@ApiModelProperty(value = "tag/edge属性类型可选:int bool string double", example = "string", required = true) @Schema(name = "tag/edge属性类型可选:int bool string double", example = "string", required = true)
private String propertyType; private String propertyType;
/** /**
* *
**/ **/
@ApiModelProperty(value = "属性描述", example = "名称") @Schema(name = "属性描述", example = "名称")
private String propertyComment; private String propertyComment;
/** /**
* (NOT NULL NULL) * (NOT NULL NULL)
**/ **/
@ApiModelProperty(value = "是否可为空: NOT NULL 或者 NULL", example = "NULL") @Schema(name = "是否可为空: NOT NULL 或者 NULL", example = "NULL")
private String isNull; private String isNull;
/** /**
* *
**/ **/
@ApiModelProperty(value = "默认值", example = "NULL") @Schema(name = "默认值", example = "NULL")
private Object defaultValue; private Object defaultValue;
public Object getDefaultValue() { public Object getDefaultValue() {

@ -1,7 +1,7 @@
package com.supervision.nebula.vo; package com.supervision.nebula.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -10,7 +10,7 @@ import java.util.Map;
* @Descriptin: 11 * @Descriptin: 11
* @ClassName: aaa * @ClassName: aaa
*/ */
@ApiModel("属性查询返回类") @Schema(name = "属性查询返回类")
public class AttributeVo { public class AttributeVo {
/** /**
@ -21,14 +21,13 @@ public class AttributeVo {
* errors : {"code":0} * errors : {"code":0}
*/ */
@ApiModelProperty("空间名称") @Schema(name = "空间名称")
private String spaceName; private String spaceName;
@ApiModelProperty()
private int latencyInUs; private int latencyInUs;
private ErrorsBean errors; private ErrorsBean errors;
@ApiModelProperty("查询返回属性集合") @Schema(name = "查询返回属性集合")
private List<DataBean> data; private List<DataBean> data;
@ApiModelProperty("返回字段名集合") @Schema(name = "返回字段名集合")
private List<String> columns; private List<String> columns;
private Map<String, List<String>> fieldMap; private Map<String, List<String>> fieldMap;
@ -84,7 +83,7 @@ public class AttributeVo {
/** /**
* code : 0 * code : 0
*/ */
@ApiModelProperty("错误码0正常") @Schema(name = "错误码0正常")
private int code; private int code;
public int getCode() { public int getCode() {
@ -97,9 +96,9 @@ public class AttributeVo {
} }
public static class DataBean { public static class DataBean {
@ApiModelProperty("元数据") @Schema(name = "元数据")
private List<String> meta; private List<String> meta;
@ApiModelProperty("字段值集合") @Schema(name = "字段值集合")
private List<String> row; private List<String> row;
public List<String> getMeta() { public List<String> getMeta() {

@ -1,13 +1,13 @@
package com.supervision.nebula.vo; package com.supervision.nebula.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
/** /**
* @Descriptin: * @Descriptin:
* @ClassName: CommonVo * @ClassName: CommonVo
*/ */
@ApiModel("操作通用返回类") @Schema(name = "操作通用返回类")
public class CommonVo { public class CommonVo {
/** /**
@ -16,9 +16,8 @@ public class CommonVo {
* errors : {"code":0} * errors : {"code":0}
*/ */
@ApiModelProperty("空间名称") @Schema(name = "空间名称")
private String spaceName; private String spaceName;
@ApiModelProperty()
private int latencyInUs; private int latencyInUs;
private ErrorsBean errors; private ErrorsBean errors;
@ -50,7 +49,7 @@ public class CommonVo {
/** /**
* code : 0 * code : 0
*/ */
@ApiModelProperty("错误码0正常") @Schema(name = "错误码0正常")
private int code; private int code;
public int getCode() { public int getCode() {

@ -1,24 +1,24 @@
package com.supervision.nebula.vo; package com.supervision.nebula.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
/** /**
* @Descriptin: * @Descriptin:
* @ClassName: DetailSpace * @ClassName: DetailSpace
*/ */
@ApiModel("图空间详情实体") @Schema(name = "图空间详情实体")
@Data @Data
public class DetailSpace { public class DetailSpace {
@ApiModelProperty("空间名称") @Schema(name = "空间名称")
private String space; private String space;
@ApiModelProperty("标签个数") @Schema(name = "标签个数")
private Integer tagsNum; private Integer tagsNum;
@ApiModelProperty("边类型个数") @Schema(name = "边类型个数")
private Integer edgesNum; private Integer edgesNum;
} }

@ -1,6 +1,7 @@
package com.supervision.vo; package com.supervision.vo;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.util.Map; import java.util.Map;
@ -8,17 +9,17 @@ import java.util.Map;
@Data @Data
public class EdgeVO { public class EdgeVO {
@ApiModelProperty("来源节点ID") @Schema(name = "来源节点ID")
private String source; private String source;
@ApiModelProperty("目标节点ID") @Schema(name = "目标节点ID")
private String target; private String target;
@ApiModelProperty("连线展示的名称,可能为空") @Schema(name = "连线展示的名称,可能为空")
private String name; private String name;
@ApiModelProperty("连线展示的名称,=name,前端需要") @Schema(name = "连线展示的名称,=name,前端需要")
private String label; private String label;
@ApiModelProperty("连线所拥有的属性") @Schema(name = "连线所拥有的属性")
private Map<String, Object> params; private Map<String, Object> params;
} }

@ -1,7 +1,7 @@
package com.supervision.vo; package com.supervision.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -11,16 +11,16 @@ import java.util.List;
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@ApiModel @Schema
public class GraphVO { public class GraphVO {
@ApiModelProperty("节点") @Schema(name = "节点")
private List<NodeVO> nodes; private List<NodeVO> nodes;
@ApiModelProperty("关系") @Schema(name = "关系")
private List<EdgeVO> edges; private List<EdgeVO> edges;
@ApiModelProperty("图例的List") @Schema(name = "图例的List")
private List<GraphLegendVO> legendList; private List<GraphLegendVO> legendList;
private String graphTree; private String graphTree;

@ -1,29 +1,29 @@
package com.supervision.vo; package com.supervision.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
@Data @Data
@ApiModel @Schema
public class NodeVO { public class NodeVO {
@ApiModelProperty("节点ID") @Schema(name = "节点ID")
private String id; private String id;
@ApiModelProperty("节点值(页面展示)") @Schema(name = "节点值(页面展示)")
private String nodeValue; private String nodeValue;
@ApiModelProperty("节点颜色") @Schema(name = "节点颜色")
private String nodeColour; private String nodeColour;
@ApiModelProperty("节点级别 1 2 3 4级") @Schema(name = "节点级别 1 2 3 4级")
private Integer nodeLevel; private Integer nodeLevel;
@ApiModelProperty("节点类型") @Schema(name = "节点类型")
private String nodeType; private String nodeType;
@ApiModelProperty("节点描述") @Schema(name = "节点描述")
private String nodeDesc; private String nodeDesc;
@ApiModelProperty("节点拥有的属性列表") @Schema(name = "节点拥有的属性列表")
private Map<String, Object> params = new LinkedHashMap<>(); private Map<String, Object> params = new LinkedHashMap<>();
} }

@ -1,7 +1,7 @@
package com.supervision.vo; package com.supervision.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -9,33 +9,33 @@ import java.util.List;
import java.util.Map; import java.util.Map;
@Data @Data
@ApiModel @Schema
public class TreeNodeVO { public class TreeNodeVO {
@ApiModelProperty("图谱ID") @Schema(name = "图谱ID")
private String id; private String id;
@ApiModelProperty("节点值") @Schema(name = "节点值")
private String nodeValue; private String nodeValue;
@ApiModelProperty("节点颜色") @Schema(name = "节点颜色")
private String nodeColour; private String nodeColour;
@ApiModelProperty("节点级别") @Schema(name = "节点级别")
private Integer nodeLevel; private Integer nodeLevel;
@ApiModelProperty("节点类型") @Schema(name = "节点类型")
private String nodeType; private String nodeType;
@ApiModelProperty("节点描述") @Schema(name = "节点描述")
private String nodeDesc; private String nodeDesc;
@ApiModelProperty("节点的属性列表") @Schema(name = "节点的属性列表")
private Map<String, Object> params = new LinkedHashMap<>(); private Map<String, Object> params = new LinkedHashMap<>();
/** /**
* *
*/ */
@ApiModelProperty("子节点") @Schema(name = "子节点")
private List<TreeNodeVO> children; private List<TreeNodeVO> children;
} }

@ -63,16 +63,14 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba.nacos</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>nacos-common</artifactId> <artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId> <artifactId>spring-cloud-starter-loadbalancer</artifactId>
</dependency> </dependency>
<dependency> <dependency>

@ -1,20 +1,19 @@
package com.supervision.manage.controller.config; package com.supervision.manage.controller.config;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.supervision.manage.service.AncillaryItemManageService; import com.supervision.manage.service.AncillaryItemManageService;
import com.supervision.model.ConfigAncillaryItem; import com.supervision.model.ConfigAncillaryItem;
import com.supervision.vo.ask.AncillaryItemReqVo; import com.supervision.vo.ask.AncillaryItemReqVo;
import com.supervision.vo.ask.ConfigAncillaryItemResVO; import com.supervision.vo.ask.ConfigAncillaryItemResVO;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@Api(tags = "辅助检查项管理") @Tag(name = "辅助检查项管理")
@RestController @RestController
@RequestMapping("ancillaryItem") @RequestMapping("ancillaryItem")
@RequiredArgsConstructor @RequiredArgsConstructor
@ -22,31 +21,31 @@ public class AncillaryItemManageController {
private final AncillaryItemManageService ancillaryItemManageService; private final AncillaryItemManageService ancillaryItemManageService;
@ApiOperation("查询辅助检查项目列表") @Operation(summary = "查询辅助检查项目列表")
@GetMapping("queryAncillaryItemList") @GetMapping("queryAncillaryItemList")
public List<ConfigAncillaryItemResVO> queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) { public List<ConfigAncillaryItemResVO> queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) {
return ancillaryItemManageService.queryAncillaryItemList(ancillaryItemReqVo); return ancillaryItemManageService.queryAncillaryItemList(ancillaryItemReqVo);
} }
@ApiOperation("分页查询辅助检查") @Operation(summary = "分页查询辅助检查")
@GetMapping("queryAncillaryPage") @GetMapping("queryAncillaryPage")
public IPage<ConfigAncillaryItem> queryAncillaryPage(String name, String type, Integer pageNum, Integer pageSize) { public IPage<ConfigAncillaryItem> queryAncillaryPage(String name, String type, Integer pageNum, Integer pageSize) {
return ancillaryItemManageService.queryAncillaryPage(name, type, pageNum, pageSize); return ancillaryItemManageService.queryAncillaryPage(name, type, pageNum, pageSize);
} }
@ApiOperation("保存辅助检查项") @Operation(summary = "保存辅助检查项")
@PostMapping("saveAncillaryItem") @PostMapping("saveAncillaryItem")
public void saveAncillaryItem(@RequestBody ConfigAncillaryItem configAncillaryItem) { public void saveAncillaryItem(@RequestBody ConfigAncillaryItem configAncillaryItem) {
ancillaryItemManageService.saveAncillaryItem(configAncillaryItem); ancillaryItemManageService.saveAncillaryItem(configAncillaryItem);
} }
@ApiOperation("修改辅助检查项") @Operation(summary = "修改辅助检查项")
@PostMapping("modifyAncillaryItem") @PostMapping("modifyAncillaryItem")
public void modifyAncillaryItem(@RequestBody ConfigAncillaryItem configAncillaryItem) { public void modifyAncillaryItem(@RequestBody ConfigAncillaryItem configAncillaryItem) {
ancillaryItemManageService.modifyAncillaryItem(configAncillaryItem); ancillaryItemManageService.modifyAncillaryItem(configAncillaryItem);
} }
@ApiOperation("删除辅助检查项") @Operation(summary = "删除辅助检查项")
@GetMapping("deleteAncillaryItem") @GetMapping("deleteAncillaryItem")
public void deleteAncillaryItem(String id){ public void deleteAncillaryItem(String id){
ancillaryItemManageService.deleteAncillaryItem(id); ancillaryItemManageService.deleteAncillaryItem(id);

@ -8,9 +8,9 @@ import com.supervision.model.AskTemplateQuestionLibrary;
import com.supervision.model.CommonDic; import com.supervision.model.CommonDic;
import com.supervision.vo.manage.AskQuestionLibraryReqVo; import com.supervision.vo.manage.AskQuestionLibraryReqVo;
import com.supervision.vo.manage.AskQuestionLibraryResVo; import com.supervision.vo.manage.AskQuestionLibraryResVo;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -18,14 +18,15 @@ import org.springframework.web.multipart.MultipartFile;
import java.util.List; import java.util.List;
@Api(tags = "问题库管理") @Tag(name = "问题库管理")
@RestController @RestController
@RequestMapping("/aqLibrary") @RequestMapping("/aqLibrary")
@RequiredArgsConstructor @RequiredArgsConstructor
public class AskQuestionLibraryManageController { public class AskQuestionLibraryManageController {
private final AskQuestionLibraryManageService askQuestionLibraryManageService; private final AskQuestionLibraryManageService askQuestionLibraryManageService;
@ApiOperation("查询问题库列表")
@Operation(summary = "查询问题库列表")
@GetMapping("/queryList") @GetMapping("/queryList")
public List<AskQuestionLibraryResVo> queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo) { public List<AskQuestionLibraryResVo> queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo) {
@ -33,7 +34,7 @@ public class AskQuestionLibraryManageController {
} }
@ApiOperation("分页查询问题库列表") @Operation(summary = "分页查询问题库列表")
@GetMapping("/queryPageList") @GetMapping("/queryPageList")
public Page<AskQuestionLibraryResVo> queryPageList(@RequestParam(defaultValue = "1") Integer pageNum, public Page<AskQuestionLibraryResVo> queryPageList(@RequestParam(defaultValue = "1") Integer pageNum,
@RequestParam(defaultValue = "10") Integer pageSize, @RequestParam(defaultValue = "10") Integer pageSize,
@ -44,7 +45,7 @@ public class AskQuestionLibraryManageController {
} }
@ApiOperation("保存问题库信息") @Operation(summary = "保存问题库信息")
@PostMapping("/saveQuestionLibrary") @PostMapping("/saveQuestionLibrary")
public String saveQuestionLibrary(@RequestBody AskTemplateQuestionLibrary askTemplateQuestionLibrary) { public String saveQuestionLibrary(@RequestBody AskTemplateQuestionLibrary askTemplateQuestionLibrary) {
@ -53,7 +54,7 @@ public class AskQuestionLibraryManageController {
} }
@ApiOperation("更新问题库信息") @Operation(summary = "更新问题库信息")
@PutMapping("/updateQuestionLibrary") @PutMapping("/updateQuestionLibrary")
public boolean updateQuestionLibrary(@RequestBody AskTemplateQuestionLibrary askTemplateQuestionLibrary) { public boolean updateQuestionLibrary(@RequestBody AskTemplateQuestionLibrary askTemplateQuestionLibrary) {
@ -61,7 +62,7 @@ public class AskQuestionLibraryManageController {
} }
@ApiOperation("删除问题库信息") @Operation(summary = "删除问题库信息")
@DeleteMapping("/deleteQuestionLibrary") @DeleteMapping("/deleteQuestionLibrary")
public boolean deleteQuestionLibrary(@RequestParam("id") String id) { public boolean deleteQuestionLibrary(@RequestParam("id") String id) {
@ -69,7 +70,7 @@ public class AskQuestionLibraryManageController {
} }
@ApiOperation("查询问题类目编码列表") @Operation(summary = "查询问题类目编码列表")
@GetMapping("/queryItemList") @GetMapping("/queryItemList")
public List<CommonDic> queryItemList() { public List<CommonDic> queryItemList() {
@ -77,14 +78,14 @@ public class AskQuestionLibraryManageController {
} }
@ApiOperation("导入问题库信息") @Operation(summary = "导入问题库信息")
@PostMapping("/uploadQuestionLibrary") @PostMapping("/uploadQuestionLibrary")
public UploadQuestionLibraryResVo uploadQuestionLibrary(@ApiParam("文件") @RequestParam("file") MultipartFile multipartFile) throws Exception { public UploadQuestionLibraryResVo uploadQuestionLibrary(@Parameter(name = "文件") @RequestParam("file") MultipartFile multipartFile) throws Exception {
return askQuestionLibraryManageService.uploadQuestionLibrary(multipartFile); return askQuestionLibraryManageService.uploadQuestionLibrary(multipartFile);
} }
@ApiOperation("下载问题库导入模板") @Operation(summary = "下载问题库导入模板")
@GetMapping("/downloadQuestionLibraryTemplate") @GetMapping("/downloadQuestionLibraryTemplate")
public void downloadQuestionLibraryTemplate(HttpServletResponse response) throws Exception { public void downloadQuestionLibraryTemplate(HttpServletResponse response) throws Exception {

@ -2,8 +2,8 @@ package com.supervision.manage.controller.config;
import com.supervision.dto.CommonDictTreeDTO; import com.supervision.dto.CommonDictTreeDTO;
import com.supervision.service.CommonDicService; import com.supervision.service.CommonDicService;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -11,14 +11,15 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
@Api(tags = "通用字典管理") @Tag(name = "通用字典管理")
@RestController @RestController
@RequestMapping("/commonDic") @RequestMapping("/commonDic")
@RequiredArgsConstructor @RequiredArgsConstructor
public class CommonDicManageController { public class CommonDicManageController {
private final CommonDicService commonDicService; private final CommonDicService commonDicService;
@ApiOperation("查询字典树")
@Operation(summary = "查询字典树")
@GetMapping("/queryCommonDictTree") @GetMapping("/queryCommonDictTree")
public List<CommonDictTreeDTO> queryAncillaryItemList(String groupCode) { public List<CommonDictTreeDTO> queryAncillaryItemList(String groupCode) {
return commonDicService.queryCommonDictTree(groupCode); return commonDicService.queryCommonDictTree(groupCode);

@ -3,20 +3,21 @@ package com.supervision.manage.controller.config;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.supervision.manage.service.DrugManageService; import com.supervision.manage.service.DrugManageService;
import com.supervision.model.ConfigDrug; import com.supervision.model.ConfigDrug;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@Api(tags = "药物管理") @Tag(name = "药物管理")
@RestController @RestController
@RequestMapping("/drugManage") @RequestMapping("/drugManage")
@RequiredArgsConstructor @RequiredArgsConstructor
public class DrugManageController { public class DrugManageController {
private final DrugManageService drugManageService; private final DrugManageService drugManageService;
@ApiOperation("新增药物信息")
@Operation(summary = "新增药物信息")
@PostMapping("/save") @PostMapping("/save")
public String saveDrug(@RequestBody ConfigDrug configDrug) { public String saveDrug(@RequestBody ConfigDrug configDrug) {
@ -24,28 +25,28 @@ public class DrugManageController {
return result.getId(); return result.getId();
} }
@ApiOperation("删除药物信息") @Operation(summary = "删除药物信息")
@DeleteMapping("/delete") @DeleteMapping("/delete")
public boolean deleteDrug(@ApiParam("药品id")@RequestParam("id") String id) { public boolean deleteDrug(@Parameter(name = "药品id") @RequestParam("id") String id) {
return drugManageService.deleteDrugById(id); return drugManageService.deleteDrugById(id);
} }
@ApiOperation("修改药物信息") @Operation(summary = "修改药物信息")
@PutMapping("/update") @PutMapping("/update")
public boolean updateDrug(@RequestBody ConfigDrug configDrug) { public boolean updateDrug(@RequestBody ConfigDrug configDrug) {
return drugManageService.updateDrug(configDrug); return drugManageService.updateDrug(configDrug);
} }
@ApiOperation("分页查询药物信息") @Operation(summary = "分页查询药物信息")
@GetMapping("/queryPageList") @GetMapping("/queryPageList")
public IPage<? extends ConfigDrug> queryPageList(@RequestParam(defaultValue = "1")Integer pageNum, public IPage<? extends ConfigDrug> queryPageList(@RequestParam(defaultValue = "1") Integer pageNum,
@RequestParam(defaultValue = "10")Integer pageSize, @RequestParam(defaultValue = "10") Integer pageSize,
@ApiParam("药品名称") @RequestParam(required = false) String drugName, @Parameter(name = "药品名称") @RequestParam(required = false) String drugName,
@ApiParam("一级措施id") @RequestParam(required = false) String firstMeasuresId, @Parameter(name = "一级措施id") @RequestParam(required = false) String firstMeasuresId,
@ApiParam("剂型") @RequestParam(required = false) String dosageForm ) { @Parameter(name = "剂型") @RequestParam(required = false) String dosageForm) {
return drugManageService.queryPageList(pageNum, pageSize, drugName,firstMeasuresId,dosageForm); return drugManageService.queryPageList(pageNum, pageSize, drugName, firstMeasuresId, dosageForm);
} }
} }

@ -3,9 +3,9 @@ package com.supervision.manage.controller.config;
import com.supervision.manage.service.PhysicalLocationManageService; import com.supervision.manage.service.PhysicalLocationManageService;
import com.supervision.vo.manage.PhysicalLocationNode; import com.supervision.vo.manage.PhysicalLocationNode;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -13,14 +13,15 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
@Api(tags = "身体位置管理") @Tag(name = "身体位置管理")
@RestController @RestController
@RequestMapping("physicalLocation") @RequestMapping("physicalLocation")
@RequiredArgsConstructor @RequiredArgsConstructor
public class PhysicalLocationManageController { public class PhysicalLocationManageController {
private final PhysicalLocationManageService physicalLocationManageService; private final PhysicalLocationManageService physicalLocationManageService;
@ApiOperation("查询身体部位树")
@Operation(summary = "查询身体部位树")
@GetMapping("/queryTree") @GetMapping("/queryTree")
public List<PhysicalLocationNode> queryTree() { public List<PhysicalLocationNode> queryTree() {
@ -28,7 +29,7 @@ public class PhysicalLocationManageController {
} }
@ApiModelProperty("查询体格检查身体部位配置树(支持已配置部位)") @Schema(name = "查询体格检查身体部位配置树(支持已配置部位)")
@GetMapping("queryLocationTreeForPhysicalConfig") @GetMapping("queryLocationTreeForPhysicalConfig")
public List<PhysicalLocationNode> queryLocationTreeForPhysicalConfig(String physicalId) { public List<PhysicalLocationNode> queryLocationTreeForPhysicalConfig(String physicalId) {
return physicalLocationManageService.queryLocationTreeForPhysicalConfig(physicalId); return physicalLocationManageService.queryLocationTreeForPhysicalConfig(physicalId);

@ -5,15 +5,14 @@ import com.supervision.manage.pojo.vo.PhysicalToolVO;
import com.supervision.manage.service.PhysicalToolManageService; import com.supervision.manage.service.PhysicalToolManageService;
import com.supervision.model.ConfigPhysicalTool; import com.supervision.model.ConfigPhysicalTool;
import com.supervision.vo.ask.ConfigPhysicalToolResVO; import com.supervision.vo.ask.ConfigPhysicalToolResVO;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@Api(tags = "体格检查工具管理") @Tag(name = "体格检查工具管理")
@RestController @RestController
@RequestMapping("physicalTool") @RequestMapping("physicalTool")
@RequiredArgsConstructor @RequiredArgsConstructor
@ -21,41 +20,40 @@ public class PhysicalToolManageController {
private final PhysicalToolManageService physicalToolManageService; private final PhysicalToolManageService physicalToolManageService;
@ApiOperation(value = "查询体格检查的工具列表") @Operation(summary = "查询体格检查的工具列表")
@GetMapping("queryPhysicalToolList") @GetMapping("queryPhysicalToolList")
public List<ConfigPhysicalToolResVO> queryPhysicalToolList() { public List<ConfigPhysicalToolResVO> queryPhysicalToolList() {
return physicalToolManageService.queryPhysicalToolList(); return physicalToolManageService.queryPhysicalToolList();
} }
@ApiOperation("体格检查分页查询") @Operation(summary = "体格检查分页查询")
@GetMapping("queryPhysicalPage") @GetMapping("queryPhysicalPage")
public IPage<ConfigPhysicalTool> queryConfigPhysicalToolPage(String toolName, String type, Integer requireLocation, public IPage<ConfigPhysicalTool> queryConfigPhysicalToolPage(String toolName, String type, Integer requireLocation,
Integer pageNum, Integer pageSize) { Integer pageNum, Integer pageSize) {
return physicalToolManageService.queryConfigPhysicalToolPage(toolName, type, requireLocation, pageNum, pageSize); return physicalToolManageService.queryConfigPhysicalToolPage(toolName, type, requireLocation, pageNum, pageSize);
} }
@ApiOperation("查询体格检查工具详细信息") @Operation(summary = "查询体格检查工具详细信息")
@GetMapping("queryConfigPhysicalToolDetail") @GetMapping("queryConfigPhysicalToolDetail")
public PhysicalToolVO queryConfigPhysicalToolDetail(String id) { public PhysicalToolVO queryConfigPhysicalToolDetail(String id) {
return physicalToolManageService.queryConfigPhysicalToolDetail(id); return physicalToolManageService.queryConfigPhysicalToolDetail(id);
} }
@Operation(summary = "保存体格工具")
@ApiOperation("保存体格工具")
@PostMapping("saveConfigPhysicalTool") @PostMapping("saveConfigPhysicalTool")
public void saveConfigPhysicalTool(@RequestBody PhysicalToolVO physicalToolVO) { public void saveConfigPhysicalTool(@RequestBody PhysicalToolVO physicalToolVO) {
physicalToolManageService.saveConfigPhysicalTool(physicalToolVO); physicalToolManageService.saveConfigPhysicalTool(physicalToolVO);
} }
@ApiOperation("修改体格工具") @Operation(summary = "修改体格工具")
@PostMapping("modifyConfigPhysicalTool") @PostMapping("modifyConfigPhysicalTool")
public void modifyConfigPhysicalTool(@RequestBody PhysicalToolVO physicalToolVO) { public void modifyConfigPhysicalTool(@RequestBody PhysicalToolVO physicalToolVO) {
physicalToolManageService.modifyConfigPhysicalTool(physicalToolVO); physicalToolManageService.modifyConfigPhysicalTool(physicalToolVO);
} }
@ApiOperation("删除体格工具") @Operation(summary = "删除体格工具")
@GetMapping("deleteConfigPhysicalTool") @GetMapping("deleteConfigPhysicalTool")
public void deleteConfigPhysicalTool(String id) { public void deleteConfigPhysicalTool(String id) {
physicalToolManageService.deleteConfigPhysicalTool(id); physicalToolManageService.deleteConfigPhysicalTool(id);

@ -2,19 +2,18 @@ package com.supervision.manage.controller.config;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.supervision.manage.service.ConfigTreatmentPlanManageService; import com.supervision.manage.service.ConfigTreatmentPlanManageService;
import com.supervision.model.ConfigDrug;
import com.supervision.vo.manage.TreatmentPlanTreeNode;
import com.supervision.model.ConfigTreatmentPlan; import com.supervision.model.ConfigTreatmentPlan;
import io.swagger.annotations.Api; import com.supervision.vo.manage.TreatmentPlanTreeNode;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@Api(tags = "处置计划管理") @Tag(name = "处置计划管理")
@RestController @RestController
@RequestMapping("treatmentPlan") @RequestMapping("treatmentPlan")
@RequiredArgsConstructor @RequiredArgsConstructor
@ -22,35 +21,35 @@ public class TreatmentPlanManageController {
private final ConfigTreatmentPlanManageService configTreatmentPlanManageService; private final ConfigTreatmentPlanManageService configTreatmentPlanManageService;
@ApiOperation("查询处置计划树") @Operation(summary = "查询处置计划树")
@GetMapping("/queryTree") @GetMapping("/queryTree")
public List<TreatmentPlanTreeNode> queryTree(@ApiParam("处置方式")@RequestParam(required = false) Integer disposalMethod) { public List<TreatmentPlanTreeNode> queryTree(@Parameter(name = "处置方式") @RequestParam(required = false) Integer disposalMethod) {
return configTreatmentPlanManageService.queryTree(disposalMethod); return configTreatmentPlanManageService.queryTree(disposalMethod);
} }
@ApiOperation("根据id查询处置计划详情") @Operation(summary = "根据id查询处置计划详情")
@GetMapping("/findById") @GetMapping("/findById")
public ConfigTreatmentPlan findById(@ApiParam("主键") @RequestParam String id) { public ConfigTreatmentPlan findById(@Parameter(name = "主键") @RequestParam String id) {
return configTreatmentPlanManageService.findById(id); return configTreatmentPlanManageService.findById(id);
} }
@ApiOperation("分页查询处置计划列表") @Operation(summary = "分页查询处置计划列表")
@GetMapping("/queryPageList") @GetMapping("/queryPageList")
public IPage<? extends ConfigTreatmentPlan> queryPageList(@RequestParam(defaultValue = "1")Integer pageNum, public IPage<? extends ConfigTreatmentPlan> queryPageList(@RequestParam(defaultValue = "1")Integer pageNum,
@RequestParam(defaultValue = "10")Integer pageSize, @RequestParam(defaultValue = "10")Integer pageSize,
@ApiParam("处置方式(0门诊 1住院)") @Parameter(name = "处置方式(0门诊 1住院)")
@RequestParam(required = false) Integer disposalMethod) { @RequestParam(required = false) Integer disposalMethod) {
return configTreatmentPlanManageService.queryPageList(pageNum, pageSize, disposalMethod); return configTreatmentPlanManageService.queryPageList(pageNum, pageSize, disposalMethod);
} }
@ApiOperation("保存处置计划") @Operation(summary = "保存处置计划")
@PostMapping("/save") @PostMapping("/save")
public String saveTreatmentPlan(@RequestBody ConfigTreatmentPlan configTreatmentPlan) { public String saveTreatmentPlan(@RequestBody ConfigTreatmentPlan configTreatmentPlan) {
@ -58,14 +57,14 @@ public class TreatmentPlanManageController {
return result.getId(); return result.getId();
} }
@ApiOperation("删除处置计划") @Operation(summary = "删除处置计划")
@DeleteMapping("/delete") @DeleteMapping("/delete")
public boolean deleteTreatmentPlan(@RequestParam("id") String id) { public boolean deleteTreatmentPlan(@RequestParam("id") String id) {
return configTreatmentPlanManageService.deleteTreatmentPlan(id); return configTreatmentPlanManageService.deleteTreatmentPlan(id);
} }
@ApiOperation("修改处置计划") @Operation(summary = "修改处置计划")
@PutMapping("/update") @PutMapping("/update")
public boolean updateTreatmentPlan(@RequestBody ConfigTreatmentPlan configDrug) { public boolean updateTreatmentPlan(@RequestBody ConfigTreatmentPlan configDrug) {

@ -6,15 +6,15 @@ import com.supervision.vo.ask.AncillaryItemReqVo;
import com.supervision.vo.ask.ConfigAncillaryItemResVO; import com.supervision.vo.ask.ConfigAncillaryItemResVO;
import com.supervision.vo.manage.DiseaseAncillaryReqVo; import com.supervision.vo.manage.DiseaseAncillaryReqVo;
import com.supervision.vo.manage.DiseaseAncillaryResVo; import com.supervision.vo.manage.DiseaseAncillaryResVo;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@Api(tags = "疾病辅助检查管理") @Tag(name = "疾病辅助检查管理")
@RestController @RestController
@RequestMapping("diseaseAncillary") @RequestMapping("diseaseAncillary")
@RequiredArgsConstructor @RequiredArgsConstructor
@ -22,7 +22,7 @@ public class DiseaseAncillaryManageController {
private final DiseaseAncillaryManageService diseaseAncillaryManageService; private final DiseaseAncillaryManageService diseaseAncillaryManageService;
@ApiOperation("新增辅助检查信息") @Operation(summary = "新增辅助检查信息")
@PostMapping("/save") @PostMapping("/save")
public String saveAncillary(@RequestBody DiseaseAncillaryReqVo diseaseAncillary) { public String saveAncillary(@RequestBody DiseaseAncillaryReqVo diseaseAncillary) {
@ -33,7 +33,7 @@ public class DiseaseAncillaryManageController {
} }
@ApiOperation("删除疾病辅助检查信息") @Operation(summary = "删除疾病辅助检查信息")
@DeleteMapping("/delete") @DeleteMapping("/delete")
public boolean deleteDiseaseAncillary(@RequestParam("id") String id) { public boolean deleteDiseaseAncillary(@RequestParam("id") String id) {
@ -42,7 +42,7 @@ public class DiseaseAncillaryManageController {
} }
@ApiOperation("修改辅助检查信息") @Operation(summary = "修改辅助检查信息")
@PutMapping("/update") @PutMapping("/update")
public boolean updateAncillary(@RequestBody DiseaseAncillaryReqVo diseaseAncillary) { public boolean updateAncillary(@RequestBody DiseaseAncillaryReqVo diseaseAncillary) {
@ -51,7 +51,7 @@ public class DiseaseAncillaryManageController {
} }
@ApiOperation("根据疾病id查询疾病辅助检查信息列表") @Operation(summary = "根据疾病id查询疾病辅助检查信息列表")
@GetMapping("/queryListByDiseaseId") @GetMapping("/queryListByDiseaseId")
public List<DiseaseAncillaryResVo> queryListByDiseaseId(@RequestParam("diseaseId") String diseaseId) { public List<DiseaseAncillaryResVo> queryListByDiseaseId(@RequestParam("diseaseId") String diseaseId) {
@ -59,7 +59,7 @@ public class DiseaseAncillaryManageController {
} }
@ApiOperation("查询疾病辅助检查项目列表") @Operation(summary = "查询疾病辅助检查项目列表")
@GetMapping("queryAncillaryItemList") @GetMapping("queryAncillaryItemList")
public List<ConfigAncillaryItemResVO> queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) { public List<ConfigAncillaryItemResVO> queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) {
return diseaseAncillaryManageService.queryAncillaryItemList(ancillaryItemReqVo); return diseaseAncillaryManageService.queryAncillaryItemList(ancillaryItemReqVo);

@ -1,15 +1,17 @@
package com.supervision.manage.controller.diseasemanage; package com.supervision.manage.controller.diseasemanage;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.supervision.manage.service.DiseaseManageService; import com.supervision.manage.service.DiseaseManageService;
import com.supervision.model.Disease; import com.supervision.model.Disease;
import com.supervision.vo.manage.DiseaseReqVo; import com.supervision.vo.manage.DiseaseReqVo;
import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.SchemaProperty;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@Api(tags = "疾病管理") @Tag(name = "疾病管理")
@RestController @RestController
@RequestMapping("disease") @RequestMapping("disease")
@RequiredArgsConstructor @RequiredArgsConstructor
@ -20,22 +22,22 @@ public class DiseaseManageController {
@PostMapping("/save") @PostMapping("/save")
@ApiOperation("新增疾病") @Operation(summary = "新增疾病")
@ApiModelProperty @SchemaProperty
public Disease saveDisease(@RequestBody Disease disease) { public Disease saveDisease(@RequestBody Disease disease) {
return diseaseManageService.saveDisease(disease); return diseaseManageService.saveDisease(disease);
} }
@ApiOperation("删除疾病") @Operation(summary = "删除疾病")
@DeleteMapping("/delete") @DeleteMapping("/delete")
public boolean deleteDisease(@ApiParam("疾病id") @RequestParam String id) { public boolean deleteDisease(@Parameter(name = "疾病id") @RequestParam String id) {
return diseaseManageService.deleteDisease(id); return diseaseManageService.deleteDisease(id);
} }
@ApiOperation("修改疾病信息") @Operation(summary = "修改疾病信息")
@PutMapping("/update") @PutMapping("/update")
public boolean updateDisease(@RequestBody Disease disease) { public boolean updateDisease(@RequestBody Disease disease) {
@ -44,7 +46,7 @@ public class DiseaseManageController {
} }
@ApiOperation("查询分页疾病列表") @Operation(summary = "查询分页疾病列表")
@GetMapping("/queryPageList") @GetMapping("/queryPageList")
public IPage<? extends Disease> queryPageList(@RequestParam(defaultValue = "1")Integer pageNum, public IPage<? extends Disease> queryPageList(@RequestParam(defaultValue = "1")Integer pageNum,
@RequestParam(defaultValue = "10")Integer pageSize, @RequestParam(defaultValue = "10")Integer pageSize,

@ -2,18 +2,18 @@ package com.supervision.manage.controller.diseasemanage;
import com.supervision.manage.service.DiseasePhysicalManageService; import com.supervision.manage.service.DiseasePhysicalManageService;
import com.supervision.model.DiseasePhysical;
import com.supervision.vo.manage.DiseasePhysicalLocationNodeVo; import com.supervision.vo.manage.DiseasePhysicalLocationNodeVo;
import com.supervision.vo.manage.DiseasePhysicalReqVo; import com.supervision.vo.manage.DiseasePhysicalReqVo;
import com.supervision.vo.manage.DiseasePhysicalResVo; import com.supervision.vo.manage.DiseasePhysicalResVo;
import com.supervision.model.DiseasePhysical; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@Api(tags = "疾病体格检查管理") @Tag(name = "疾病体格检查管理")
@RestController @RestController
@RequestMapping("/diseasePhysical") @RequestMapping("/diseasePhysical")
@RequiredArgsConstructor @RequiredArgsConstructor
@ -22,7 +22,7 @@ public class DiseasePhysicalManageController {
private final DiseasePhysicalManageService diseasePhysicalManageService; private final DiseasePhysicalManageService diseasePhysicalManageService;
@ApiOperation("新增体格检查信息") @Operation(summary = "新增体格检查信息")
@PostMapping("/save") @PostMapping("/save")
public String savePhysical(@RequestBody DiseasePhysicalReqVo diseasePhysical) { public String savePhysical(@RequestBody DiseasePhysicalReqVo diseasePhysical) {
@ -31,7 +31,7 @@ public class DiseasePhysicalManageController {
return result.getId(); return result.getId();
} }
@ApiOperation("删除体格检查") @Operation(summary = "删除体格检查")
@DeleteMapping("/delete") @DeleteMapping("/delete")
public boolean deletePhysical(@RequestParam String id) { public boolean deletePhysical(@RequestParam String id) {
@ -39,7 +39,7 @@ public class DiseasePhysicalManageController {
} }
@ApiOperation("修改体格检查信息") @Operation(summary = "修改体格检查信息")
@PutMapping("/update") @PutMapping("/update")
public boolean updatePhysical(@RequestBody DiseasePhysicalReqVo diseasePhysical) { public boolean updatePhysical(@RequestBody DiseasePhysicalReqVo diseasePhysical) {
@ -48,7 +48,7 @@ public class DiseasePhysicalManageController {
} }
@ApiOperation("根据疾病id查询体格检查列表") @Operation(summary = "根据疾病id查询体格检查列表")
@GetMapping("/queryListByDiseaseId") @GetMapping("/queryListByDiseaseId")
public List<DiseasePhysicalResVo> queryListByDiseaseId(@RequestParam("diseaseId") String diseaseId) { public List<DiseasePhysicalResVo> queryListByDiseaseId(@RequestParam("diseaseId") String diseaseId) {
@ -56,7 +56,7 @@ public class DiseasePhysicalManageController {
} }
@ApiOperation("查询疾病身体部位树") @Operation(summary = "查询疾病身体部位树")
@GetMapping("/queryTree") @GetMapping("/queryTree")
public List<DiseasePhysicalLocationNodeVo> queryTree(@RequestParam("diseaseId") String diseaseId, public List<DiseasePhysicalLocationNodeVo> queryTree(@RequestParam("diseaseId") String diseaseId,
@RequestParam(value = "toolId",required = false) String toolId) { @RequestParam(value = "toolId",required = false) String toolId) {

@ -6,14 +6,14 @@ import com.supervision.model.DiseaseQuestion;
import com.supervision.vo.manage.AskQuestionLibraryReqVo; import com.supervision.vo.manage.AskQuestionLibraryReqVo;
import com.supervision.vo.manage.AskQuestionLibraryResVo; import com.supervision.vo.manage.AskQuestionLibraryResVo;
import com.supervision.vo.manage.DiseaseQuestionResVo; import com.supervision.vo.manage.DiseaseQuestionResVo;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@Api(tags = "疾病问题管理") @Tag(name = "疾病问题管理")
@RestController @RestController
@RequestMapping("diseaseQuestion") @RequestMapping("diseaseQuestion")
@RequiredArgsConstructor @RequiredArgsConstructor
@ -22,7 +22,7 @@ public class DiseaseQuestionManageController {
private final DiseaseQuestionManageService diseaseQuestionManageService; private final DiseaseQuestionManageService diseaseQuestionManageService;
@ApiOperation("保存疾病问题信息") @Operation(summary = "保存疾病问题信息")
@PostMapping("/batchSave") @PostMapping("/batchSave")
public boolean batchSaveQuestionList(@RequestBody List<DiseaseQuestion> diseaseQuestionList) { public boolean batchSaveQuestionList(@RequestBody List<DiseaseQuestion> diseaseQuestionList) {
@ -31,7 +31,7 @@ public class DiseaseQuestionManageController {
} }
@ApiOperation("删除疾病问题") @Operation(summary = "删除疾病问题")
@DeleteMapping("/delete") @DeleteMapping("/delete")
public boolean deleteDiseaseQuestion(@RequestParam String id) { public boolean deleteDiseaseQuestion(@RequestParam String id) {
@ -40,8 +40,7 @@ public class DiseaseQuestionManageController {
} }
@Operation(summary = "根据疾病id查询问题库信息列表")
@ApiOperation("根据疾病id查询问题库信息列表")
@GetMapping("/queryListByDiseaseId") @GetMapping("/queryListByDiseaseId")
public List<DiseaseQuestionResVo> queryPageByDiseaseId(@RequestParam("diseaseId") String diseaseId) { public List<DiseaseQuestionResVo> queryPageByDiseaseId(@RequestParam("diseaseId") String diseaseId) {
@ -49,7 +48,7 @@ public class DiseaseQuestionManageController {
} }
@ApiOperation("分页查询问题库列表(排除已选择的问题)") @Operation(summary = "分页查询问题库列表(排除已选择的问题)")
@GetMapping("/queryQaLibPageList") @GetMapping("/queryQaLibPageList")
public Page<AskQuestionLibraryResVo> queryQaLibPageList(@RequestParam(defaultValue = "1") Integer pageNum, public Page<AskQuestionLibraryResVo> queryQaLibPageList(@RequestParam(defaultValue = "1") Integer pageNum,
@RequestParam(defaultValue = "10") Integer pageSize, @RequestParam(defaultValue = "10") Integer pageSize,

@ -4,16 +4,18 @@ package com.supervision.manage.controller.diseasemanage;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.supervision.manage.service.DiseaseTreatmentPlanManageService; import com.supervision.manage.service.DiseaseTreatmentPlanManageService;
import com.supervision.model.DiseaseTreatmentPlan; import com.supervision.model.DiseaseTreatmentPlan;
import com.supervision.vo.manage.*; import com.supervision.vo.manage.DiseaseTreatmentPlanReqVo;
import io.swagger.annotations.Api; import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
import io.swagger.annotations.ApiOperation; import com.supervision.vo.manage.DiseaseTreatmentPlanTreeNode;
import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@Api(tags = "疾病处置计划管理") @Tag(name = "疾病处置计划管理")
@RestController @RestController
@RequestMapping("/diseaseTreatmentPlan") @RequestMapping("/diseaseTreatmentPlan")
@RequiredArgsConstructor @RequiredArgsConstructor
@ -22,7 +24,7 @@ public class DiseaseTreatmentPlanManageController {
private final DiseaseTreatmentPlanManageService diseaseTreatmentPlanManageService; private final DiseaseTreatmentPlanManageService diseaseTreatmentPlanManageService;
@ApiOperation("保存处置信息") @Operation(summary = "保存处置信息")
@PostMapping("/save") @PostMapping("/save")
public String saveTreatmentPlan(@RequestBody DiseaseTreatmentPlanReqVo diseaseTreatmentPlan) { public String saveTreatmentPlan(@RequestBody DiseaseTreatmentPlanReqVo diseaseTreatmentPlan) {
// 适配前端传入数据 // 适配前端传入数据
@ -32,7 +34,7 @@ public class DiseaseTreatmentPlanManageController {
} }
@ApiOperation("批量保存处置信息") @Operation(summary = "批量保存处置信息")
@PostMapping("/batchSave") @PostMapping("/batchSave")
public boolean batchSaveTreatmentPlan(@RequestBody List<DiseaseTreatmentPlan> diseaseTreatmentPlanList) { public boolean batchSaveTreatmentPlan(@RequestBody List<DiseaseTreatmentPlan> diseaseTreatmentPlanList) {
@ -40,7 +42,7 @@ public class DiseaseTreatmentPlanManageController {
return true; return true;
} }
@ApiOperation("根据疾病id查询疾病处置信息列表") @Operation(summary = "根据疾病id查询疾病处置信息列表")
@GetMapping("/queryListByDiseaseId") @GetMapping("/queryListByDiseaseId")
public List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId) { public List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId) {
@ -57,7 +59,7 @@ public class DiseaseTreatmentPlanManageController {
} }
@ApiOperation("删除疾病处置计划") @Operation(summary = "删除疾病处置计划")
@DeleteMapping("/delete") @DeleteMapping("/delete")
public boolean deleteDiseaseTreatmentPlan(@RequestParam("id") String id) { public boolean deleteDiseaseTreatmentPlan(@RequestParam("id") String id) {
@ -65,7 +67,7 @@ public class DiseaseTreatmentPlanManageController {
} }
@ApiOperation("修改处置计划") @Operation(summary = "修改处置计划")
@PutMapping("/update") @PutMapping("/update")
public boolean updateDiseaseTreatmentPlan(@RequestBody DiseaseTreatmentPlanReqVo diseaseTreatmentPlan) { public boolean updateDiseaseTreatmentPlan(@RequestBody DiseaseTreatmentPlanReqVo diseaseTreatmentPlan) {
// 适配前端传入数据 // 适配前端传入数据
@ -74,12 +76,12 @@ public class DiseaseTreatmentPlanManageController {
} }
@ApiOperation("查询处置计划树") @Operation(summary = "查询处置计划树")
@GetMapping("/queryTree") @GetMapping("/queryTree")
public List<DiseaseTreatmentPlanTreeNode> queryTree(@ApiParam("处置方式")@RequestParam(required = false) Integer disposalMethod, public List<DiseaseTreatmentPlanTreeNode> queryTree(@Parameter(name = "处置方式") @RequestParam(required = false) Integer disposalMethod,
@ApiParam("疾病id") String diseaseId) { @Parameter(name = "疾病id") String diseaseId) {
return diseaseTreatmentPlanManageService.queryDiseaseTreatmentPlanTree(disposalMethod,diseaseId); return diseaseTreatmentPlanManageService.queryDiseaseTreatmentPlanTree(disposalMethod, diseaseId);
} }

@ -3,15 +3,15 @@ package com.supervision.manage.controller.file;
import com.supervision.manage.pojo.vo.DirectoryInfoVO; import com.supervision.manage.pojo.vo.DirectoryInfoVO;
import com.supervision.manage.service.DirectoryInfoManageService; import com.supervision.manage.service.DirectoryInfoManageService;
import com.supervision.model.DirectoryInfo; import com.supervision.model.DirectoryInfo;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@Api(tags = "文件目录管理") @Tag(name = "文件目录管理")
@RestController @RestController
@RequestMapping("/directoryManage") @RequestMapping("/directoryManage")
@RequiredArgsConstructor @RequiredArgsConstructor
@ -19,7 +19,8 @@ public class DirectoryInfoManageController {
private final DirectoryInfoManageService directoryInfoManageService; private final DirectoryInfoManageService directoryInfoManageService;
@ApiOperation("新增文件目录")
@Operation(summary = "新增文件目录")
@PostMapping("/addDirectory") @PostMapping("/addDirectory")
public String addDirectory(@RequestBody DirectoryInfo directoryInfo) { public String addDirectory(@RequestBody DirectoryInfo directoryInfo) {
@ -28,15 +29,15 @@ public class DirectoryInfoManageController {
} }
@ApiOperation("删除文件目录") @Operation(summary = "删除文件目录")
@DeleteMapping("/deleteDirectory") @DeleteMapping("/deleteDirectory")
public boolean deleteDirectory(@ApiParam("目录ID") @RequestParam("directoryId") String directoryId) { public boolean deleteDirectory(@Parameter(name = "目录ID") @RequestParam("directoryId") String directoryId) {
return directoryInfoManageService.deleteDirectory(directoryId); return directoryInfoManageService.deleteDirectory(directoryId);
} }
@ApiOperation("修改文件目录") @Operation(summary = "修改文件目录")
@PutMapping("/updateDirectory") @PutMapping("/updateDirectory")
public boolean updateDirectory(@RequestBody DirectoryInfo directoryInfo) { public boolean updateDirectory(@RequestBody DirectoryInfo directoryInfo) {
@ -45,12 +46,12 @@ public class DirectoryInfoManageController {
} }
@ApiOperation("查询文件目录") @Operation(summary = "查询文件目录")
@GetMapping("/getFileDirectory") @GetMapping("/getFileDirectory")
public List<DirectoryInfoVO> getFileDirectory(@ApiParam("父级目录ID") @RequestParam(value = "parentDirId",required = false) String parentDirId, public List<DirectoryInfoVO> getFileDirectory(@Parameter(name = "父级目录ID") @RequestParam(value = "parentDirId", required = false) String parentDirId,
@ApiParam("文件名称") @RequestParam(value = "fileName",required = false) String fileName) { @Parameter(name = "文件名称") @RequestParam(value = "fileName", required = false) String fileName) {
return directoryInfoManageService.getFileDirectory(parentDirId,fileName); return directoryInfoManageService.getFileDirectory(parentDirId, fileName);
} }
} }

@ -2,22 +2,23 @@ package com.supervision.manage.controller.file;
import com.supervision.manage.service.FileManageService; import com.supervision.manage.service.FileManageService;
import com.supervision.model.FileResource; import com.supervision.model.FileResource;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@Api(tags = "文件管理") @Tag(name = "文件管理")
@RestController @RestController
@RequestMapping("/fileManage") @RequestMapping("/fileManage")
@RequiredArgsConstructor @RequiredArgsConstructor
public class FileManageController { public class FileManageController {
private final FileManageService fileManageService; private final FileManageService fileManageService;
@ApiOperation("上传文件")
@Operation(summary = "上传文件")
@PostMapping("/uploadFile") @PostMapping("/uploadFile")
public FileResource uploadFile(@RequestParam("file") MultipartFile multipartFile) throws Exception { public FileResource uploadFile(@RequestParam("file") MultipartFile multipartFile) throws Exception {
@ -25,7 +26,7 @@ public class FileManageController {
} }
@ApiOperation("下载文件") @Operation(summary = "下载文件")
@GetMapping("/downloadFile") @GetMapping("/downloadFile")
public void downloadFile(@RequestParam String fileId, HttpServletResponse response) throws Exception { public void downloadFile(@RequestParam String fileId, HttpServletResponse response) throws Exception {
@ -33,7 +34,7 @@ public class FileManageController {
} }
@ApiOperation("删除文件") @Operation(summary = "删除文件")
@DeleteMapping("/deleteFile") @DeleteMapping("/deleteFile")
public boolean deleteFile(@RequestParam String fileId) throws Exception { public boolean deleteFile(@RequestParam String fileId) throws Exception {

@ -4,15 +4,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.supervision.manage.service.MaterialLibraryManageService; import com.supervision.manage.service.MaterialLibraryManageService;
import com.supervision.model.MaterialLibrary; import com.supervision.model.MaterialLibrary;
import com.supervision.vo.manage.MaterialLibraryResVo; import com.supervision.vo.manage.MaterialLibraryResVo;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@Api(tags = "素材库管理") @Tag(name = "素材库管理")
@RestController @RestController
@RequestMapping("/materialLibrary") @RequestMapping("/materialLibrary")
@RequiredArgsConstructor @RequiredArgsConstructor
@ -20,7 +20,7 @@ public class MaterialLibraryManageController {
private final MaterialLibraryManageService materialLibraryManageService; private final MaterialLibraryManageService materialLibraryManageService;
@ApiOperation("上传素材") @Operation(summary = "上传素材")
@PostMapping("/uploadMaterial") @PostMapping("/uploadMaterial")
public void uploadMaterial(@RequestBody List<MaterialLibrary> materialLibraryList) throws Exception { public void uploadMaterial(@RequestBody List<MaterialLibrary> materialLibraryList) throws Exception {
@ -28,26 +28,25 @@ public class MaterialLibraryManageController {
} }
@ApiOperation("素材管理分页查询") @Operation(summary = "素材管理分页查询")
@GetMapping("queryMedicalRecPage") @GetMapping("queryMedicalRecPage")
public IPage<MaterialLibraryResVo> queryMaterialPage(MaterialLibrary materialLibrary, public IPage<MaterialLibraryResVo> queryMaterialPage(MaterialLibrary materialLibrary,
@ApiParam("页码") @RequestParam(name="pageNum",defaultValue = "1") Integer pageNum, @Parameter(name = "页码") @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@ApiParam("每页大小") @RequestParam(name="pageSize",defaultValue = "10")Integer pageSize) { @Parameter(name = "每页大小") @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
return materialLibraryManageService.queryMaterialPage(materialLibrary,pageNum, pageSize); return materialLibraryManageService.queryMaterialPage(materialLibrary, pageNum, pageSize);
} }
@Operation(summary = "删除素材")
@ApiOperation("删除素材")
@DeleteMapping("/deleteMaterial") @DeleteMapping("/deleteMaterial")
public boolean deleteMaterial(@ApiParam("素材id") @RequestParam("id") String id) throws Exception { public boolean deleteMaterial(@Parameter(name = "素材id") @RequestParam("id") String id) throws Exception {
return materialLibraryManageService.deleteMaterial(id); return materialLibraryManageService.deleteMaterial(id);
} }
@ApiOperation("修改素材") @Operation(summary = "修改素材")
@PutMapping("/updateMaterial") @PutMapping("/updateMaterial")
public boolean updateMaterial(@RequestBody MaterialLibrary materialLibrary) { public boolean updateMaterial(@RequestBody MaterialLibrary materialLibrary) {

@ -11,9 +11,9 @@ import com.supervision.vo.manage.DiseaseAncillaryResVo;
import com.supervision.vo.manage.DiseasePhysicalResVo; import com.supervision.vo.manage.DiseasePhysicalResVo;
import com.supervision.vo.manage.DiseaseTreatmentPlanResVo; import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
import com.supervision.vo.manage.MedicalRecPageResVO; import com.supervision.vo.manage.MedicalRecPageResVO;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -21,7 +21,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.util.List; import java.util.List;
@Api(tags = "病历管理") @Tag(name = "病历管理")
@RestController @RestController
@RequestMapping("/medicalRecManage") @RequestMapping("/medicalRecManage")
@RequiredArgsConstructor @RequiredArgsConstructor
@ -29,93 +29,93 @@ public class MedicalRecManageController {
private final MedicalRecManageService medicalRecManageService; private final MedicalRecManageService medicalRecManageService;
@ApiOperation("初步诊断下拉列表联想(这个接口查询所有疾病,包含复合疾病)") @Operation(summary = "初步诊断下拉列表联想(这个接口查询所有疾病,包含复合疾病)")
@GetMapping("queryDiseaseListByDropList") @GetMapping("queryDiseaseListByDropList")
public List<Disease> queryDiseaseListByDropList() { public List<Disease> queryDiseaseListByDropList() {
return medicalRecManageService.queryDiseaseListByDropList(); return medicalRecManageService.queryDiseaseListByDropList();
} }
@ApiOperation("初步诊断下拉列表联想(这个接口只查询单一疾病)") @Operation(summary = "初步诊断下拉列表联想(这个接口只查询单一疾病)")
@GetMapping("querySingleDiseaseListByDropList") @GetMapping("querySingleDiseaseListByDropList")
public List<Disease> querySingleDiseaseListByDropList() { public List<Disease> querySingleDiseaseListByDropList() {
return medicalRecManageService.querySingleDiseaseListByDropList(); return medicalRecManageService.querySingleDiseaseListByDropList();
} }
@ApiOperation("病历管理分页查询") @Operation(summary = "病历管理分页查询")
@GetMapping("queryMedicalRecPage") @GetMapping("queryMedicalRecPage")
public IPage<MedicalRecPageResVO> queryMedicalRecManagePage(@ApiParam("主诉") String selfDescKeyword, public IPage<MedicalRecPageResVO> queryMedicalRecManagePage(@Parameter(name = "主诉") String selfDescKeyword,
@ApiParam("性别") String gender, @Parameter(name = "性别") String gender,
@ApiParam("疾病ID") String diseaseId, @Parameter(name = "疾病ID") String diseaseId,
Integer pageNum, Integer pageSize) { Integer pageNum, Integer pageSize) {
return medicalRecManageService.queryMedicalRecManagePage(selfDescKeyword, gender, diseaseId, pageNum, pageSize); return medicalRecManageService.queryMedicalRecManagePage(selfDescKeyword, gender, diseaseId, pageNum, pageSize);
} }
@ApiOperation("创建病历") @Operation(summary = "创建病历")
@PostMapping("createMedicalRec") @PostMapping("createMedicalRec")
public void createMedicalRec(@RequestBody MedicalRecManageVO reqVO) { public void createMedicalRec(@RequestBody MedicalRecManageVO reqVO) {
medicalRecManageService.createMedicalRec(reqVO); medicalRecManageService.createMedicalRec(reqVO);
} }
@ApiOperation("创建疾病时可选的的疾病列表") @Operation(summary = "创建疾病时可选的的疾病列表")
@GetMapping("queryDiseaseListByCreat") @GetMapping("queryDiseaseListByCreat")
public List<Disease> queryDiseaseListByCreat() { public List<Disease> queryDiseaseListByCreat() {
return medicalRecManageService.queryDiseaseListByCreat(); return medicalRecManageService.queryDiseaseListByCreat();
} }
@ApiOperation("创建病历时查看配置的辅助检查项") @Operation(summary = "创建病历时查看配置的辅助检查项")
@GetMapping("queryDiseaseAncillaryByCreat") @GetMapping("queryDiseaseAncillaryByCreat")
public List<DiseaseAncillaryResVo> queryDiseaseAncillaryByCreat(String diseaseId){ public List<DiseaseAncillaryResVo> queryDiseaseAncillaryByCreat(String diseaseId){
return medicalRecManageService.queryDiseaseAncillaryByCreat(diseaseId); return medicalRecManageService.queryDiseaseAncillaryByCreat(diseaseId);
} }
@ApiOperation("创建病历时查看配置的体格检查项") @Operation(summary = "创建病历时查看配置的体格检查项")
@GetMapping("queryDiseasePhysicalByCreat") @GetMapping("queryDiseasePhysicalByCreat")
public List<DiseasePhysicalResVo> queryDiseasePhysicalByCreat(String diseaseId){ public List<DiseasePhysicalResVo> queryDiseasePhysicalByCreat(String diseaseId){
return medicalRecManageService.queryDiseasePhysicalByCreat(diseaseId); return medicalRecManageService.queryDiseasePhysicalByCreat(diseaseId);
} }
@ApiOperation("创建病历时查看配置的处置计划") @Operation(summary = "创建病历时查看配置的处置计划")
@GetMapping("queryDiseaseTreatmentPlanByCreat") @GetMapping("queryDiseaseTreatmentPlanByCreat")
public List<DiseaseTreatmentPlanResVo> queryDiseaseTreatmentPlanByCreat(String diseaseId){ public List<DiseaseTreatmentPlanResVo> queryDiseaseTreatmentPlanByCreat(String diseaseId){
return medicalRecManageService.queryDiseaseTreatmentPlanByCreat(diseaseId); return medicalRecManageService.queryDiseaseTreatmentPlanByCreat(diseaseId);
} }
@ApiOperation("创建病历时,根据疾病ID查询配置的问题") @Operation(summary = "创建病历时,根据疾病ID查询配置的问题")
@GetMapping("queryQuestionListByCreat") @GetMapping("queryQuestionListByCreat")
public List<MedicalRecQaVO> queryQuestionListByCreat(String diseaseId) { public List<MedicalRecQaVO> queryQuestionListByCreat(String diseaseId) {
return medicalRecManageService.queryQuestionListByCreat(diseaseId); return medicalRecManageService.queryQuestionListByCreat(diseaseId);
} }
@ApiOperation("修改病历") @Operation(summary = "修改病历")
@PostMapping("modifyMedicalRec") @PostMapping("modifyMedicalRec")
public void modifyMedicalRec(@RequestBody MedicalRecManageVO reqVO) { public void modifyMedicalRec(@RequestBody MedicalRecManageVO reqVO) {
medicalRecManageService.modifyMedicalRec(reqVO); medicalRecManageService.modifyMedicalRec(reqVO);
} }
@ApiOperation("查询病例详细信息") @Operation(summary = "查询病例详细信息")
@GetMapping("queryMedicalRecInfo") @GetMapping("queryMedicalRecInfo")
public MedicalRecInfoVO queryMedicalRecInfo(String id) { public MedicalRecInfoVO queryMedicalRecInfo(String id) {
return medicalRecManageService.queryMedicalRecInfo(id); return medicalRecManageService.queryMedicalRecInfo(id);
} }
@ApiOperation("删除病历") @Operation(summary = "删除病历")
@GetMapping("deleteMedicalRec") @GetMapping("deleteMedicalRec")
public void deleteMedicalRec(String id) { public void deleteMedicalRec(String id) {
medicalRecManageService.deleteMedicalRec(id); medicalRecManageService.deleteMedicalRec(id);
} }
@ApiOperation("预导入疾病问题回答") @Operation(summary = "预导入疾病问题回答")
@PostMapping("/preUploadMedicalAnswer") @PostMapping("/preUploadMedicalAnswer")
public MedicalAnswerVideoResVo uploadMedicalAnswer(@ApiParam("文件") @RequestParam("file") MultipartFile multipartFile, public MedicalAnswerVideoResVo uploadMedicalAnswer(@Parameter(name = "文件") @RequestParam("file") MultipartFile multipartFile,
@ApiParam("病例id") @RequestParam(value = "medicalRecId",required = false) String medicalRecId) throws Exception { @Parameter(name = "病例id") @RequestParam(value = "medicalRecId", required = false) String medicalRecId) throws Exception {
return medicalRecManageService.preUploadMedicalAnswer(multipartFile, medicalRecId); return medicalRecManageService.preUploadMedicalAnswer(multipartFile, medicalRecId);
} }
@ApiOperation("下载疾病问题导入模板") @Operation(summary = "下载疾病问题导入模板")
@GetMapping("/downloadMedicalAnswerTemplate") @GetMapping("/downloadMedicalAnswerTemplate")
public void downloadMedicalAnswerTemplate(HttpServletResponse response) throws Exception { public void downloadMedicalAnswerTemplate(HttpServletResponse response) throws Exception {
@ -123,11 +123,10 @@ public class MedicalRecManageController {
} }
@Operation(summary = "查询病例默认问题")
@ApiOperation("查询病例默认问题")
@GetMapping("/queryMedicalDefaultAnswer") @GetMapping("/queryMedicalDefaultAnswer")
public List<MedicalRecQaVO> queryMedicalDefaultAnswer(@ApiParam("病例id") public List<MedicalRecQaVO> queryMedicalDefaultAnswer(@Parameter(name = "病例id")
@RequestParam(value = "medicalRecId",required = false) String medicalRecId) { @RequestParam(value = "medicalRecId", required = false) String medicalRecId) {
return medicalRecManageService.queryMedicalDefaultAnswer(medicalRecId); return medicalRecManageService.queryMedicalDefaultAnswer(medicalRecId);
} }

@ -1,15 +1,15 @@
package com.supervision.manage.controller.processrecord; package com.supervision.manage.controller.processrecord;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.supervision.manage.service.ProcessRecordService;
import com.supervision.model.ProcessEvaluation; import com.supervision.model.ProcessEvaluation;
import com.supervision.vo.result.ProcessRecordVO; import com.supervision.vo.result.ProcessRecordVO;
import com.supervision.manage.service.ProcessRecordService; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@Api(tags = "问诊病案管理") @Tag(name = "问诊病案管理")
@RestController @RestController
@RequestMapping("processRecord") @RequestMapping("processRecord")
@RequiredArgsConstructor @RequiredArgsConstructor
@ -18,19 +18,19 @@ public class ProcessRecordController {
private final ProcessRecordService processRecordService; private final ProcessRecordService processRecordService;
@ApiOperation("分页查询病案管理") @Operation(summary = "分页查询病案管理")
@GetMapping("queryProcessRecordPage") @GetMapping("queryProcessRecordPage")
public IPage<ProcessRecordVO> queryProcessRecordPage(String studentName, String medicalRecNo, String diseaseType, Integer pageNum, Integer pageSize) { public IPage<ProcessRecordVO> queryProcessRecordPage(String studentName, String medicalRecNo, String diseaseType, Integer pageNum, Integer pageSize) {
return processRecordService.queryProcessRecordPage(studentName, medicalRecNo, diseaseType, pageNum, pageSize); return processRecordService.queryProcessRecordPage(studentName, medicalRecNo, diseaseType, pageNum, pageSize);
} }
@ApiOperation("保存或更新考核病案评估") @Operation(summary = "保存或更新考核病案评估")
@PostMapping("saveProcessEvaluation") @PostMapping("saveProcessEvaluation")
public ProcessEvaluation saveOrUpdateProcessEvaluation(@RequestBody ProcessEvaluation processEvaluation){ public ProcessEvaluation saveOrUpdateProcessEvaluation(@RequestBody ProcessEvaluation processEvaluation){
return processRecordService.saveOrUpdateProcessEvaluation(processEvaluation); return processRecordService.saveOrUpdateProcessEvaluation(processEvaluation);
} }
@ApiOperation("查询考核病案评估") @Operation(summary = "查询考核病案评估")
@GetMapping("queryProcessEvaluation") @GetMapping("queryProcessEvaluation")
public ProcessEvaluation queryProcessEvaluation(String processId){ public ProcessEvaluation queryProcessEvaluation(String processId){
return processRecordService.queryProcessEvaluation(processId); return processRecordService.queryProcessEvaluation(processId);

@ -3,7 +3,7 @@ package com.supervision.manage.controller.qaKnowledge;
import com.supervision.dto.QaKnowledgeDTO; import com.supervision.dto.QaKnowledgeDTO;
import com.supervision.manage.service.QaKnowledgeManageService; import com.supervision.manage.service.QaKnowledgeManageService;
import com.supervision.service.AskTemplateQuestionLibraryService; import com.supervision.service.AskTemplateQuestionLibraryService;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -20,13 +20,13 @@ public class QaKnowledgeManageController {
private final QaKnowledgeManageService qaKnowledgeManageService; private final QaKnowledgeManageService qaKnowledgeManageService;
@ApiOperation("获取问答知识库") @Operation(summary = "获取问答知识库")
@GetMapping("queryQaKnowledge") @GetMapping("queryQaKnowledge")
public List<QaKnowledgeDTO> queryQaKnowledge() { public List<QaKnowledgeDTO> queryQaKnowledge() {
return askTemplateQuestionLibraryService.queryQaKnowledge(); return askTemplateQuestionLibraryService.queryQaKnowledge();
} }
@ApiOperation("手动刷新知识库") @Operation(summary = "手动刷新知识库")
@GetMapping("refreshQaKnowledge") @GetMapping("refreshQaKnowledge")
public void refreshQaKnowledge() { public void refreshQaKnowledge() {
qaKnowledgeManageService.refreshQaKnowledge(); qaKnowledgeManageService.refreshQaKnowledge();

@ -8,14 +8,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.supervision.exception.BusinessException; import com.supervision.exception.BusinessException;
import com.supervision.model.User; import com.supervision.model.User;
import com.supervision.service.UserService; import com.supervision.service.UserService;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.Optional; import java.util.Optional;
@Api(tags = "用户管理") @Tag(name = "用户管理")
@RestController @RestController
@RequestMapping("userManage") @RequestMapping("userManage")
@RequiredArgsConstructor @RequiredArgsConstructor
@ -23,14 +23,14 @@ public class UserManager {
private final UserService userService; private final UserService userService;
@ApiOperation("查询用户列表") @Operation(summary = "查询用户列表")
@GetMapping("queryUserPage") @GetMapping("queryUserPage")
public IPage<User> queryUserPage(String userName, Integer roleCode, Integer pageNum, Integer pageSize) { public IPage<User> queryUserPage(String userName, Integer roleCode, Integer pageNum, Integer pageSize) {
return userService.lambdaQuery().like(StrUtil.isNotBlank(userName), User::getName, userName) return userService.lambdaQuery().like(StrUtil.isNotBlank(userName), User::getName, userName)
.eq(ObjectUtil.isNotEmpty(roleCode), User::getRoleCode, roleCode).page(new Page<>(pageNum, pageSize)); .eq(ObjectUtil.isNotEmpty(roleCode), User::getRoleCode, roleCode).page(new Page<>(pageNum, pageSize));
} }
@ApiOperation("保存用户") @Operation(summary = "保存用户")
@PostMapping("saveUser") @PostMapping("saveUser")
public void saveUser(@RequestBody User user) { public void saveUser(@RequestBody User user) {
Assert.notBlank(user.getAccount(), "用户账户不能为空"); Assert.notBlank(user.getAccount(), "用户账户不能为空");
@ -43,7 +43,7 @@ public class UserManager {
userService.save(user); userService.save(user);
} }
@ApiOperation("更新用户") @Operation(summary = "更新用户")
@PostMapping("updateUser") @PostMapping("updateUser")
public void updateUser(@RequestBody User user) { public void updateUser(@RequestBody User user) {
Assert.notBlank(user.getId(), "ID不能为空"); Assert.notBlank(user.getId(), "ID不能为空");
@ -59,7 +59,7 @@ public class UserManager {
userService.updateById(user); userService.updateById(user);
} }
@ApiOperation("停用用户") @Operation(summary = "停用用户")
@GetMapping("deactivateUser") @GetMapping("deactivateUser")
public User deactivateUser(String id) { public User deactivateUser(String id) {
User old = Optional.ofNullable(userService.getById(id)).orElseThrow(() -> new BusinessException("用户不存在")); User old = Optional.ofNullable(userService.getById(id)).orElseThrow(() -> new BusinessException("用户不存在"));

@ -1,6 +1,7 @@
package com.supervision.manage.pojo.vo; package com.supervision.manage.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ -8,15 +9,15 @@ import java.util.List;
@Data @Data
public class MedicalAnswerVideoResVo { public class MedicalAnswerVideoResVo {
@ApiModelProperty("成功个数") @Schema(name = "成功个数")
private int totalCount; private int totalCount;
@ApiModelProperty("失败个数") @Schema(name = "失败个数")
private int failCount; private int failCount;
@ApiModelProperty("文件id") @Schema(name = "文件id")
private String fileId; private String fileId;
@ApiModelProperty("应答策略") @Schema(name = "应答策略")
private List<MedicalRecQaVO> qaList; private List<MedicalRecQaVO> qaList;
} }

@ -3,8 +3,7 @@ package com.supervision.manage.pojo.vo;
import com.supervision.vo.manage.DiseaseAncillaryResVo; import com.supervision.vo.manage.DiseaseAncillaryResVo;
import com.supervision.vo.manage.DiseasePhysicalResVo; import com.supervision.vo.manage.DiseasePhysicalResVo;
import com.supervision.vo.manage.DiseaseTreatmentPlanResVo; import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -12,19 +11,19 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@ApiModel(value = "病历管理详细信息", parent = MedicalRecManageVO.class) @Schema(name = "病历管理详细信息", implementation = MedicalRecManageVO.class)
public class MedicalRecInfoVO extends MedicalRecManageVO { public class MedicalRecInfoVO extends MedicalRecManageVO {
@ApiModelProperty("疾病名称") @Schema(name = "疾病名称")
private String diseaseName; private String diseaseName;
@ApiModelProperty("辅助检查") @Schema(name = "辅助检查")
private List<DiseaseAncillaryResVo> ancillaryList; private List<DiseaseAncillaryResVo> ancillaryList;
@ApiModelProperty("体格检查") @Schema(name = "体格检查")
private List<DiseasePhysicalResVo> physicalList; private List<DiseasePhysicalResVo> physicalList;
@ApiModelProperty("处置计划列表") @Schema(name = "处置计划列表")
private List<DiseaseTreatmentPlanResVo> treatmentPlanList; private List<DiseaseTreatmentPlanResVo> treatmentPlanList;
} }

@ -1,8 +1,7 @@
package com.supervision.manage.pojo.vo; package com.supervision.manage.pojo.vo;
import com.supervision.model.MedicalRec; import com.supervision.model.MedicalRec;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -11,17 +10,17 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@ApiModel(value = "病历管理创建及新建", parent = MedicalRec.class) @Schema(name = "病历管理创建及新建", implementation = MedicalRec.class)
public class MedicalRecManageVO extends MedicalRec { public class MedicalRecManageVO extends MedicalRec {
@NotBlank(message = "疾病不能为空") @NotBlank(message = "疾病不能为空")
@ApiModelProperty("step:1 疾病ID") @Schema(name = "step:1 疾病ID")
private String diseaseId; private String diseaseId;
@ApiModelProperty("step:4 应答策略") @Schema(name = "step:4 应答策略")
private List<MedicalRecQaVO> qaList; private List<MedicalRecQaVO> qaList;
@ApiModelProperty("step:4 应答策略(默认回答)") @Schema(name = "step:4 应答策略(默认回答)")
private List<MedicalRecQaVO> defaultQaList; private List<MedicalRecQaVO> defaultQaList;
} }

@ -1,6 +1,7 @@
package com.supervision.manage.pojo.vo; package com.supervision.manage.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ -8,37 +9,37 @@ import java.util.List;
@Data @Data
public class MedicalRecQaVO { public class MedicalRecQaVO {
@ApiModelProperty("本条问答ID,对应vp_ask_patient_answer表ID,更新必填") @Schema(name = "本条问答ID,对应vp_ask_patient_answer表ID,更新必填")
private String id; private String id;
/** /**
* ID * ID
*/ */
@ApiModelProperty(" 问题库问题ID,新增更新时必填") @Schema(name = " 问题库问题ID,新增更新时必填")
private String libraryQuestionId; private String libraryQuestionId;
@ApiModelProperty("问题,新增更新时不需要") @Schema(name = "问题,新增更新时不需要")
private List<String> questionList; private List<String> questionList;
@ApiModelProperty("字典ID,新增更新时不需要") @Schema(name = "字典ID,新增更新时不需要")
private Long dictId; private Long dictId;
@ApiModelProperty("问题类目,新增更新时不需要") @Schema(name = "问题类目,新增更新时不需要")
private String dictNamePath; private String dictNamePath;
@ApiModelProperty("默认回答,新增更新时不需要") @Schema(name = "默认回答,新增更新时不需要")
private String defaultAnswer; private String defaultAnswer;
@ApiModelProperty("回答的资源id,新增更新时需要") @Schema(name = "回答的资源id,新增更新时需要")
private String answerResourceId; private String answerResourceId;
@ApiModelProperty("回答的资源视频名,新增更新时需要") @Schema(name = "回答的资源视频名,新增更新时需要")
private String answerResourceName; private String answerResourceName;
@ApiModelProperty("针对病例的特定回答,新增更新时必填") @Schema(name = "针对病例的特定回答,新增更新时必填")
private String medicalRecAnswer; private String medicalRecAnswer;
@ApiModelProperty(value = "回答类型",hidden = true) @Schema(name = "回答类型", hidden = true)
private Integer answerType; private Integer answerType;

@ -1,10 +1,8 @@
package com.supervision.manage.pojo.vo; package com.supervision.manage.pojo.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.supervision.model.ConfigPhysicalTool; import com.supervision.model.ConfigPhysicalTool;
import com.supervision.model.DefaultPhysicalIndicator; import com.supervision.model.DefaultPhysicalIndicator;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -12,13 +10,13 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@ApiModel(parent = ConfigPhysicalTool.class) @Schema(implementation = ConfigPhysicalTool.class)
public class PhysicalToolVO extends ConfigPhysicalTool { public class PhysicalToolVO extends ConfigPhysicalTool {
@ApiModelProperty("需要部位正常值列表") @Schema(name = "需要部位正常值列表")
private List<DefaultPhysicalIndicator> defaultPhysicalIndicatorList; private List<DefaultPhysicalIndicator> defaultPhysicalIndicatorList;
@ApiModelProperty("无需部位的正常值") @Schema(name = "无需部位的正常值")
private DefaultPhysicalIndicator noLocationDefaultPhysicalIndicator; private DefaultPhysicalIndicator noLocationDefaultPhysicalIndicator;

@ -1,18 +1,19 @@
package com.supervision.manage.pojo.vo; package com.supervision.manage.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@Data @Data
public class UploadQuestionLibraryResVo { public class UploadQuestionLibraryResVo {
@ApiModelProperty("总数据条数") @Schema(name = "总数据条数")
private int totalCount; private int totalCount;
@ApiModelProperty("失败数据条数") @Schema(name = "失败数据条数")
private int failCount; private int failCount;
@ApiModelProperty("文件id") @Schema(name = "文件id")
private String fileId; private String fileId;
} }

@ -1,7 +1,7 @@
package com.supervision.dto; package com.supervision.dto;
import com.supervision.model.DiseaseAncillary; import com.supervision.model.DiseaseAncillary;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -10,6 +10,6 @@ import lombok.EqualsAndHashCode;
public class DiseaseAncillaryDto extends DiseaseAncillary { public class DiseaseAncillaryDto extends DiseaseAncillary {
@ApiModelProperty("项目中文名") @Schema(name = "项目中文名")
private String itemName; private String itemName;
} }

@ -1,14 +1,16 @@
package com.supervision.model; package com.supervision.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/** /**
* - * -
* @TableName vp_ask_patient_answer * @TableName vp_ask_patient_answer
@ -23,30 +25,30 @@ public class AskPatientAnswer extends Model<AskPatientAnswer> implements Seriali
private String id; private String id;
@ApiModelProperty("病例id") @Schema(name = "病例id")
private String medicalId; private String medicalId;
/** /**
* ID * ID
*/ */
@ApiModelProperty(" 问题库问题ID") @Schema(name = " 问题库问题ID")
private String libraryQuestionId; private String libraryQuestionId;
private String code; private String code;
@ApiModelProperty("问题") @Schema(name = "问题")
private String question; private String question;
/** /**
* *
*/ */
@ApiModelProperty(" 回答") @Schema(name = " 回答")
private String answer; private String answer;
@ApiModelProperty("回答资源id") @Schema(name = "回答资源id")
private String answerResourceId; private String answerResourceId;
@ApiModelProperty("回答类型 0:默认回答 1:自定义回答") @Schema(name = "回答类型 0:默认回答 1:自定义回答")
private Integer answerType; private Integer answerType;
/** /**

@ -1,15 +1,16 @@
package com.supervision.model; package com.supervision.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.supervision.handler.StringListTypeHandler;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import com.supervision.handler.StringListTypeHandler;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/** /**
* *
* @TableName vp_ask_template_question_library * @TableName vp_ask_template_question_library

@ -1,17 +1,18 @@
package com.supervision.model; package com.supervision.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.supervision.handler.StringListTypeHandler;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import com.supervision.handler.StringListTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/** /**
* *
* *
@ -19,7 +20,7 @@ import lombok.Data;
*/ */
@TableName(value = "vp_config_ancillary_item", autoResultMap = true) @TableName(value = "vp_config_ancillary_item", autoResultMap = true)
@Data @Data
@ApiModel @Schema
public class ConfigAncillaryItem implements Serializable { public class ConfigAncillaryItem implements Serializable {
/** /**
* *
@ -30,57 +31,57 @@ public class ConfigAncillaryItem implements Serializable {
/** /**
* *
*/ */
@ApiModelProperty("类型") @Schema(name = "类型")
private String type; private String type;
/** /**
* *
*/ */
@ApiModelProperty("编码") @Schema(name = "编码")
private String code; private String code;
/** /**
* *
*/ */
@ApiModelProperty("类别") @Schema(name = "类别")
private String itemClass; private String itemClass;
/** /**
* *
*/ */
@ApiModelProperty("检查名称") @Schema(name = "检查名称")
private String itemName; private String itemName;
@ApiModelProperty("检查部位名称") @Schema(name = "检查部位名称")
private String locationName; private String locationName;
@ApiModelProperty("英文名") @Schema(name = "英文名")
private String itemNameEn; private String itemNameEn;
@ApiModelProperty("检查价格") @Schema(name = "检查价格")
private BigDecimal price; private BigDecimal price;
@ApiModelProperty("关键词") @Schema(name = "关键词")
private String keyword; private String keyword;
@ApiModelProperty("说明") @Schema(name = "说明")
private String description; private String description;
/** /**
* *
*/ */
@ApiModelProperty("该项检查描述信息") @Schema(name = "该项检查描述信息")
private String info; private String info;
@ApiModelProperty("呼出问题") @Schema(name = "呼出问题")
@TableField(typeHandler = StringListTypeHandler.class) @TableField(typeHandler = StringListTypeHandler.class)
private List<String> callOutQuestion; private List<String> callOutQuestion;
@ApiModelProperty("检查类型排序") @Schema(name = "检查类型排序")
private Integer typePriority; private Integer typePriority;
@ApiModelProperty("item排序") @Schema(name = "item排序")
private Integer itemPriority; private Integer itemPriority;

@ -4,13 +4,13 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/** /**
* *
* @TableName vp_config_drug * @TableName vp_config_drug
@ -33,7 +33,7 @@ public class ConfigDrug implements Serializable {
*/ */
private String drugNameEn; private String drugNameEn;
@ApiModelProperty("一级措施id") @Schema(name = "一级措施id")
private String firstMeasuresId; private String firstMeasuresId;
/** /**

@ -4,20 +4,19 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/** /**
* *
* @TableName vp_config_physical_location * @TableName vp_config_physical_location
*/ */
@TableName(value ="vp_config_physical_location") @TableName(value ="vp_config_physical_location")
@Data @Data
@ApiModel @Schema
public class ConfigPhysicalLocation implements Serializable { public class ConfigPhysicalLocation implements Serializable {
/** /**
* *
@ -28,26 +27,26 @@ public class ConfigPhysicalLocation implements Serializable {
/** /**
* *
*/ */
@ApiModelProperty("编码") @Schema(name = "编码")
private String code; private String code;
/** /**
* *
*/ */
@ApiModelProperty("位置分类") @Schema(name = "位置分类")
private String locationClass; private String locationClass;
/** /**
* *
*/ */
@ApiModelProperty("位置名称") @Schema(name = "位置名称")
private String locationName; private String locationName;
@ApiModelProperty("部位层级") @Schema(name = "部位层级")
private String level; private String level;
@ApiModelProperty("父级Id") @Schema(name = "父级Id")
private String parentId; private String parentId;
/** /**

@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.supervision.handler.StringListTypeHandler; import com.supervision.handler.StringListTypeHandler;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ -20,7 +19,7 @@ import java.util.List;
*/ */
@TableName(value = "vp_config_physical_tool", autoResultMap = true) @TableName(value = "vp_config_physical_tool", autoResultMap = true)
@Data @Data
@ApiModel @Schema
public class ConfigPhysicalTool implements Serializable { public class ConfigPhysicalTool implements Serializable {
/** /**
* *
@ -31,45 +30,45 @@ public class ConfigPhysicalTool implements Serializable {
/** /**
* *
*/ */
@ApiModelProperty("体格检查类别") @Schema(name = "体格检查类别")
private String type; private String type;
/** /**
* *
*/ */
@ApiModelProperty("体格检查工具编码") @Schema(name = "体格检查工具编码")
private String code; private String code;
/** /**
* *
*/ */
@ApiModelProperty("体格检查工具名称") @Schema(name = "体格检查工具名称")
private String toolName; private String toolName;
@ApiModelProperty("体格检查工具图表的base64") @Schema(name = "体格检查工具图表的base64")
private String iconBase64; private String iconBase64;
/** /**
* (01) * (01)
*/ */
@ApiModelProperty("是否需要具体部位(0否1是)") @Schema(name = "是否需要具体部位(0否1是)")
private Integer requireLocation; private Integer requireLocation;
@ApiModelProperty("呼出问题") @Schema(name = "呼出问题")
@TableField(typeHandler = StringListTypeHandler.class) @TableField(typeHandler = StringListTypeHandler.class)
private List<String> callOutQuestion; private List<String> callOutQuestion;
@ApiModelProperty("检查类型排序") @Schema(name = "检查类型排序")
private Integer typePriority; private Integer typePriority;
@ApiModelProperty("code排序") @Schema(name = "code排序")
private Integer codePriority; private Integer codePriority;
@ApiModelProperty("关键词") @Schema(name = "关键词")
private String keyword; private String keyword;
@ApiModelProperty("说明") @Schema(name = "说明")
private String description; private String description;
/** /**

@ -4,14 +4,14 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.supervision.handler.StringListTypeHandler;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import com.supervision.handler.StringListTypeHandler;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/** /**
* *
* @TableName vp_treatment_plan * @TableName vp_treatment_plan
@ -25,29 +25,29 @@ public class ConfigTreatmentPlan implements Serializable {
@TableId @TableId
private String id; private String id;
@ApiModelProperty("处置计划id") @Schema(name = "处置计划id")
private String disposalPlanId; private String disposalPlanId;
/** /**
* @see com.supervision.manage.constant.DisposalPlanEnum * @see com.supervision.manage.constant.DisposalPlanEnum
*/ */
@ApiModelProperty("处置计划") @Schema(name = "处置计划")
private String disposalPlan; private String disposalPlan;
@ApiModelProperty("处置方式(0门诊 1住院)") @Schema(name = "处置方式(0门诊 1住院)")
private Integer disposalMethod; private Integer disposalMethod;
@ApiModelProperty("一级措施id") @Schema(name = "一级措施id")
private String firstMeasuresId; private String firstMeasuresId;
@ApiModelProperty("一级措施") @Schema(name = "一级措施")
private String firstMeasures; private String firstMeasures;
/** /**
* *
*/ */
@ApiModelProperty("二级措施") @Schema(name = "二级措施")
private String secondMeasures; private String secondMeasures;
/** /**
@ -56,7 +56,7 @@ public class ConfigTreatmentPlan implements Serializable {
* @since dev_2.1.0 * @since dev_2.1.0
*/ */
@Deprecated @Deprecated
@ApiModelProperty("推荐用药") @Schema(name = "推荐用药")
@TableField(typeHandler = StringListTypeHandler.class) @TableField(typeHandler = StringListTypeHandler.class)
private List<String> recommendedMedication; private List<String> recommendedMedication;

@ -3,8 +3,7 @@ package com.supervision.model;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ -16,7 +15,7 @@ import java.time.LocalDateTime;
*/ */
@TableName(value ="vp_default_physical_indicator") @TableName(value ="vp_default_physical_indicator")
@Data @Data
@ApiModel @Schema
public class DefaultPhysicalIndicator implements Serializable { public class DefaultPhysicalIndicator implements Serializable {
/** /**
* *
@ -26,31 +25,31 @@ public class DefaultPhysicalIndicator implements Serializable {
/** /**
* idid * idid
*/ */
@ApiModelProperty("工具id或项目id") @Schema(name = "工具id或项目id")
private String itemId; private String itemId;
/** /**
* id * id
*/ */
@ApiModelProperty("位置id") @Schema(name = "位置id")
private String locationId; private String locationId;
/** /**
* *
*/ */
@ApiModelProperty("性别 码值参考字典表 暂不填") @Schema(name = "性别 码值参考字典表 暂不填")
private String gender; private String gender;
/** /**
* AGE_RANGE * AGE_RANGE
*/ */
@ApiModelProperty("年龄范围 码值参考 字典表 AGE_RANGE 暂不填") @Schema(name = "年龄范围 码值参考 字典表 AGE_RANGE 暂不填")
private String ageRange; private String ageRange;
/** /**
* *
*/ */
@ApiModelProperty("指标值") @Schema(name = "指标值")
private String indicatorValue; private String indicatorValue;
/** /**

@ -1,23 +1,23 @@
package com.supervision.model; package com.supervision.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.ibatis.annotations.Insert;
/** /**
* *
* @TableName vp_diagnosis_ancillary_record * @TableName vp_diagnosis_ancillary_record
*/ */
@TableName(value ="vp_diagnosis_ancillary_record") @TableName(value ="vp_diagnosis_ancillary_record")
@Data @Data
@ApiModel @Schema
public class DiagnosisAncillaryRecord extends Model<DiagnosisAncillaryRecord> implements Serializable { public class DiagnosisAncillaryRecord extends Model<DiagnosisAncillaryRecord> implements Serializable {
/** /**
* *
@ -28,34 +28,34 @@ public class DiagnosisAncillaryRecord extends Model<DiagnosisAncillaryRecord> im
/** /**
* ID * ID
*/ */
@ApiModelProperty("流程ID") @Schema(name = "流程ID")
private String processId; private String processId;
/** /**
* ID * ID
*/ */
@ApiModelProperty("辅助检查项ID") @Schema(name = "辅助检查项ID")
private String ancillaryId; private String ancillaryId;
/** /**
* ID * ID
*/ */
@ApiModelProperty("项目ID") @Schema(name = "项目ID")
private String itemId; private String itemId;
/** /**
* *
*/ */
@ApiModelProperty("检查结果") @Schema(name = "检查结果")
private String result; private String result;
@ApiModelProperty("诊断判读结果") @Schema(name = "诊断判读结果")
private String assessmentResult; private String assessmentResult;
@ApiModelProperty("是否是证实诊断依据(0否1是)") @Schema(name = "是否是证实诊断依据(0否1是)")
private Integer basisConfirmFlag; private Integer basisConfirmFlag;
@ApiModelProperty("是否是鉴别依据(0否1是)") @Schema(name = "是否是鉴别依据(0否1是)")
private Integer basisIdentificationFlag; private Integer basisIdentificationFlag;

@ -1,22 +1,23 @@
package com.supervision.model; package com.supervision.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/** /**
* *
* @TableName vp_diagnosis_physical_record * @TableName vp_diagnosis_physical_record
*/ */
@TableName(value ="vp_diagnosis_physical_record") @TableName(value ="vp_diagnosis_physical_record")
@Data @Data
@ApiModel @Schema
public class DiagnosisPhysicalRecord extends Model<DiagnosisPhysicalRecord> implements Serializable { public class DiagnosisPhysicalRecord extends Model<DiagnosisPhysicalRecord> implements Serializable {
/** /**
* *
@ -27,37 +28,37 @@ public class DiagnosisPhysicalRecord extends Model<DiagnosisPhysicalRecord> impl
/** /**
* ID * ID
*/ */
@ApiModelProperty("诊断进程ID") @Schema(name = "诊断进程ID")
private String processId; private String processId;
/** /**
* ID * ID
*/ */
@ApiModelProperty("体格检查项ID") @Schema(name = "体格检查项ID")
private String physicalId; private String physicalId;
/** /**
* ID * ID
*/ */
@ApiModelProperty("体格检查工具ID") @Schema(name = "体格检查工具ID")
private String toolId; private String toolId;
/** /**
* ID * ID
*/ */
@ApiModelProperty("体格检查部位ID") @Schema(name = "体格检查部位ID")
private String locationId; private String locationId;
/** /**
* *
*/ */
@ApiModelProperty("体格检查结果") @Schema(name = "体格检查结果")
private String result; private String result;
@ApiModelProperty("是否是证实诊断依据(0否1是)") @Schema(name = "是否是证实诊断依据(0否1是)")
private Integer basisConfirmFlag; private Integer basisConfirmFlag;
@ApiModelProperty("是否是鉴别依据(0否1是)") @Schema(name = "是否是鉴别依据(0否1是)")
private Integer basisIdentificationFlag; private Integer basisIdentificationFlag;
/** /**

@ -1,21 +1,22 @@
package com.supervision.model; package com.supervision.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/** /**
* *
* @TableName vp_diagnosis_primary * @TableName vp_diagnosis_primary
*/ */
@TableName(value ="vp_diagnosis_primary") @TableName(value ="vp_diagnosis_primary")
@Data @Data
@ApiModel @Schema
public class DiagnosisPrimary implements Serializable { public class DiagnosisPrimary implements Serializable {
/** /**
* *
@ -26,23 +27,23 @@ public class DiagnosisPrimary implements Serializable {
/** /**
* ID * ID
*/ */
@ApiModelProperty("诊断流程ID") @Schema(name = "诊断流程ID")
private String processId; private String processId;
/** /**
* ,diseaseID * ,diseaseID
*/ */
@ApiModelProperty("初步诊断疾病ID,关联disease表ID") @Schema(name = "初步诊断疾病ID,关联disease表ID")
private String primaryDiagnosisId; private String primaryDiagnosisId;
@ApiModelProperty("初步诊断疾病名称,对应disease_name_alias,注意,这里不存在于数据库中") @Schema(name = "初步诊断疾病名称,对应disease_name_alias,注意,这里不存在于数据库中")
@TableField(exist = false) @TableField(exist = false)
private String primaryDiagnosisName; private String primaryDiagnosisName;
@ApiModelProperty("是否排除(0否1是)") @Schema(name = "是否排除(0否1是)")
private Integer excludeFlag; private Integer excludeFlag;
@ApiModelProperty("患者病情(初步诊断填写)") @Schema(name = "患者病情(初步诊断填写)")
private String patientDiseaseInfo; private String patientDiseaseInfo;
/** /**

@ -1,14 +1,16 @@
package com.supervision.model; package com.supervision.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/** /**
* *
* @TableName vp_diagnosis_primary_relation * @TableName vp_diagnosis_primary_relation
@ -25,25 +27,25 @@ public class DiagnosisPrimaryRelation extends Model<DiagnosisPrimaryRelation> im
/** /**
* ID * ID
*/ */
@ApiModelProperty("问诊流程ID,新增时不填") @Schema(name = "问诊流程ID,新增时不填")
private String processId; private String processId;
/** /**
* ID * ID
*/ */
@ApiModelProperty("初步诊断ID,新增时不填") @Schema(name = "初步诊断ID,新增时不填")
private String primaryId; private String primaryId;
/** /**
* 1 (vp_diagnosis_qa_record) 2 (vp_diagnosis_physical_record) 3 (vp_diagnosis_ancillary_record) * 1 (vp_diagnosis_qa_record) 2 (vp_diagnosis_physical_record) 3 (vp_diagnosis_ancillary_record)
*/ */
@ApiModelProperty("1 问诊 2 体格检查 3 辅助检查") @Schema(name = "1 问诊 2 体格检查 3 辅助检查")
private Integer type; private Integer type;
/** /**
* ID * ID
*/ */
@ApiModelProperty("关联关系ID") @Schema(name = "关联关系ID")
private String relationId; private String relationId;
/** /**

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save