Skip to content

H
hphy
Commit 9b37b63f authored by 向怀芳's avatar 向怀芳 🎱
Browse files
Options

长三角api文档处理

parent 0f6e2d6d
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 39 deletions
cloud-auth/pom.xml
View file @ 9b37b63f
......@@ -6,7 +6,7 @@
<parent>
<groupId>cn.sh.stc.sict</groupId>
<artifactId>cloud-parent</artifactId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<artifactId>cloud-auth</artifactId>
......
cloud-auth/src/main/resources/bootstrap-dev.yml
View file @ 9b37b63f
server:
port: 10254
port: 12254
spring:
application:
......@@ -9,7 +9,7 @@ spring:
# nacos
cloud:
nacos:
server-addr: 173.18.1.63:8848
server-addr: 127.0.0.1:8848
discovery:
namespace: bbe7ca0d-f409-4e68-bf95-5f2adad168e7
config:
......
cloud-auth/src/main/resources/bootstrap-hp.yml
View file @ 9b37b63f
server:
port: 10254
port: 12254
spring:
application:
......
cloud-common/cloud-common-bom/pom.xml
View file @ 9b37b63f
......@@ -16,7 +16,7 @@
<description>公共版本控制</description>
<properties>
<sict.version>1.0.0</sict.version>
<sict.version>1.2.0</sict.version>
<jackson.modules>2.9.6</jackson.modules>
<mybatis-plus.version>3.3.2</mybatis-plus.version>
<mysql.connector.version>8.0.15</mysql.connector.version>
......
cloud-common/cloud-common-core/pom.xml
View file @ 9b37b63f
......@@ -5,7 +5,7 @@
<parent>
<artifactId>cloud-common</artifactId>
<groupId>cn.sh.stc.sict</groupId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
cloud-common/cloud-common-core/src/main/java/cn/sh/stc/sict/cloud/common/core/constant/RedisCacheConstant.java
View file @ 9b37b63f
......@@ -73,7 +73,7 @@ public class RedisCacheConstant {
/**
* 路由存放
*/
public static final String ROUTE_KEY = "gateway_route_key";
public static final String ROUTE_KEY = "hp_gateway_route_key";
/**
* 验证码前缀
......
cloud-common/cloud-common-data/pom.xml
View file @ 9b37b63f
......@@ -5,7 +5,7 @@
<parent>
<artifactId>cloud-common</artifactId>
<groupId>cn.sh.stc.sict</groupId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
cloud-common/cloud-common-dynamic-gateway/pom.xml
View file @ 9b37b63f
......@@ -5,7 +5,7 @@
<parent>
<artifactId>cloud-common</artifactId>
<groupId>cn.sh.stc.sict</groupId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
cloud-common/cloud-common-gateway/pom.xml
View file @ 9b37b63f
......@@ -5,7 +5,7 @@
<parent>
<artifactId>cloud-common</artifactId>
<groupId>cn.sh.stc.sict</groupId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
cloud-common/cloud-common-log/pom.xml
View file @ 9b37b63f
......@@ -5,7 +5,7 @@
<parent>
<artifactId>cloud-common</artifactId>
<groupId>cn.sh.stc.sict</groupId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
cloud-common/cloud-common-minio/pom.xml
View file @ 9b37b63f
......@@ -5,7 +5,7 @@
<parent>
<artifactId>cloud-common</artifactId>
<groupId>cn.sh.stc.sict</groupId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
cloud-common/cloud-common-security/pom.xml
View file @ 9b37b63f
......@@ -6,7 +6,7 @@
<parent>
<groupId>cn.sh.stc.sict</groupId>
<artifactId>cloud-common</artifactId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<artifactId>cloud-common-security</artifactId>
......
cloud-common/cloud-common-swagger/pom.xml
View file @ 9b37b63f
......@@ -5,7 +5,7 @@
<parent>
<artifactId>cloud-common</artifactId>
<groupId>cn.sh.stc.sict</groupId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
cloud-common/pom.xml
View file @ 9b37b63f
......@@ -5,7 +5,7 @@
<parent>
<artifactId>cloud-parent</artifactId>
<groupId>cn.sh.stc.sict</groupId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
cloud-gateway/pom.xml
View file @ 9b37b63f
......@@ -5,7 +5,7 @@
<parent>
<artifactId>cloud-parent</artifactId>
<groupId>cn.sh.stc.sict</groupId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
cloud-gateway/src/main/resources/bootstrap-dev.yml
View file @ 9b37b63f
server:
port: 12999
port: 12998
spring:
application:
......@@ -7,7 +7,7 @@ spring:
# nacos
cloud:
nacos:
server-addr: 173.18.1.63:8848
server-addr: 127.0.0.1:8848
discovery:
namespace: bbe7ca0d-f409-4e68-bf95-5f2adad168e7
config:
......
pom.xml
View file @ 9b37b63f
......@@ -7,7 +7,7 @@
<groupId>cn.sh.stc.sict</groupId>
<artifactId>cloud-parent</artifactId>
<packaging>pom</packaging>
<version>1.0.0</version>
<version>1.2.0</version>
<modules>
<module>cloud-common</module>
......@@ -158,7 +158,7 @@
</dependencyManagement>
<build>
<finalName>${project.name}</finalName>
<!-- <finalName>${project.name}</finalName>-->
<resources>
<resource>
<directory>src/main/resources</directory>
......
smart-health-modules/cloud-upms/cloud-upms-api/pom.xml
View file @ 9b37b63f
......@@ -5,7 +5,7 @@
<parent>
<artifactId>cloud-upms</artifactId>
<groupId>cn.sh.stc.sict</groupId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
smart-health-modules/cloud-upms/cloud-upms-biz/pom.xml
View file @ 9b37b63f
......@@ -5,7 +5,7 @@
<parent>
<artifactId>cloud-upms</artifactId>
<groupId>cn.sh.stc.sict</groupId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/config/DynamicRouteInitRunner.java
View file @ 9b37b63f
......@@ -40,7 +40,7 @@ public class DynamicRouteInitRunner {
@EventListener({WebServerInitializedEvent.class, DynamicRouteInitEvent.class})
public void initRoute() {
Boolean result = redisTemplate.delete(RedisCacheConstant.ROUTE_KEY);
log.info("初始化网关路由 {} ", result);
log.error("初始化网关路由 {} ", result);
routeConfService.routes().forEach(route -> {
RouteDefinitionVo vo = new RouteDefinitionVo();
......@@ -54,11 +54,11 @@ public class DynamicRouteInitRunner {
JSONArray predicateObj = JSONUtil.parseArray(route.getPredicates());
vo.setPredicates(predicateObj.toList(PredicateDefinition.class));
log.info("加载路由ID：{},{}", route.getRouteId(), vo);
log.error("加载路由ID：{},{}", route.getRouteId(), vo);
redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(RouteDefinitionVo.class));
redisTemplate.opsForHash().put(RedisCacheConstant.ROUTE_KEY, route.getRouteId(), vo);
});
log.debug("初始化网关路由结束 ");
log.error("初始化网关路由结束 ");
}
/**
......
smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/config/WxMpConfiguration.java
View file @ 9b37b63f
......@@ -69,6 +69,8 @@ public class WxMpConfiguration {
configStorage.setSecret(a.getSecret());
configStorage.setToken(a.getToken());
configStorage.setAesKey(a.getAesKey());
// configStorage.setHttpProxyHost("");
// configStorage.setHttpProxyPort(9009);
return configStorage;
}).collect(Collectors.toMap(WxMpDefaultConfigImpl::getAppId, a -> a, (o, n) -> o)));
return service;
......
smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/web/SysUserBaseController.java
View file @ 9b37b63f
......@@ -120,7 +120,6 @@ public class SysUserBaseController {
if (NumberUtil.isNullOrZero(dto.getUser().getId())) {
return new R().error("用户id不可为空！");
}
sysUserBaseService.saveDto(dto);
return new R();
}
......
smart-health-modules/cloud-upms/cloud-upms-biz/src/main/resources/bootstrap-dev.yml
View file @ 9b37b63f
server:
port: 10256
port: 12256
spring:
application:
......@@ -9,7 +9,7 @@ spring:
# nacos
cloud:
nacos:
server-addr: 173.18.1.63:8848
server-addr: 127.0.0.1:8848
discovery:
namespace: bbe7ca0d-f409-4e68-bf95-5f2adad168e7
config:
......
smart-health-modules/cloud-upms/cloud-upms-biz/src/main/resources/logback-spring.xml
View file @ 9b37b63f
......@@ -63,7 +63,7 @@
<appender-ref ref="error"/>
</logger>
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root level="DEBUG">
<root level="ERROR">
<appender-ref ref="console"/>
<appender-ref ref="debug"/>
</root>
......
smart-health-modules/cloud-upms/pom.xml
View file @ 9b37b63f
......@@ -5,7 +5,7 @@
<parent>
<artifactId>smart-health-modules</artifactId>
<groupId>cn.sh.stc.sict</groupId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
smart-health-modules/pom.xml
View file @ 9b37b63f
......@@ -5,7 +5,7 @@
<parent>
<artifactId>cloud-parent</artifactId>
<groupId>cn.sh.stc.sict</groupId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
......
smart-health-modules/theme-schema/pom.xml
View file @ 9b37b63f
......@@ -5,7 +5,7 @@
<parent>
<artifactId>smart-health-modules</artifactId>
<groupId>cn.sh.stc.sict</groupId>
<version>1.0.0</version>
<version>1.2.0</version>
</parent>
<artifactId>theme-schema</artifactId>
<description>主题库</description>
......
smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/common/controller/MessageController.java 0 → 100644
View file @ 9b37b63f
package cn.sh.stc.sict.theme.common.controller;
import cn.sh.stc.sict.cloud.common.core.util.R;
import cn.sh.stc.sict.theme.common.dto.SocketMsg;
import cn.sh.stc.sict.theme.handler.WebSocketServer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.websocket.EncodeException;
import java.io.IOException;
@Slf4j
@RestController
@AllArgsConstructor
@RequestMapping("/msg")
@Api(tags = "[B]消息通知")
public class MessageController {
@ApiOperation("发送消息")
@PostMapping("/send")
public R send(@RequestBody SocketMsg msg,
@RequestParam("userId")String userId) throws IOException, EncodeException {
WebSocketServer.sendInfo(msg, userId);
return new R();
}
}
smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/HphyEvaController.java
View file @ 9b37b63f
......@@ -140,7 +140,7 @@ public class HphyEvaController {
}
@ApiOperation("调用python程序")
@ApiOperation("调用python程序（查看报告）")
@GetMapping("/python/result")
public R getPythonResult(@RequestParam("guideId") Long guideId,
@ApiParam("纬度") @RequestParam(value = "addX",required = false)String addX,
......
smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/IndexController.java 0 → 100644
View file @ 9b37b63f
package cn.sh.stc.sict.theme.hphy.controller.mp;
import cn.sh.stc.sict.cloud.common.core.util.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author F_xh
*/
@Slf4j
@RestController
@RequestMapping("/c/index")
@Api(tags = "[C]index相关接口")
public class IndexController {
@ApiOperation("保存患者满意度")
@PostMapping("/satisfaction")
public R saveSatisfaction(){
return new R();
}
}
smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/WDController.java
View file @ 9b37b63f
......@@ -24,7 +24,7 @@ import java.util.List;
@Slf4j
@RestController
@RequestMapping("/c/wd")
@Api(tags = "[C]万达相关接口")
@Api(tags = "[C]wanda相关接口")
public class WDController {
@Autowired
......@@ -84,4 +84,10 @@ public class WDController {
}
return new R().success(list);
}
@ApiOperation("获取测压亭列表")
@GetMapping("/pressure/pavilion")
public R getPressureStationList(){
return new R();
}
}
smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/HphyPatientFollowInfoController.java
View file @ 9b37b63f
......@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/hphypatientfollowinfo")
@AllArgsConstructor
@Slf4j
@Api(tags = "[D]高血压患者随访表")
@Api(tags = "[D]患者随访表")
public class HphyPatientFollowInfoController {
private HphyPatientFollowInfoService hphyPatientFollowInfoService;
......@@ -33,7 +33,6 @@ public class HphyPatientFollowInfoController {
/**
* 分页查询
* @param page 分页对象
* @param hphyPatientFollowInfo 高血压患者随访表
* @return
*/
@ApiOperation("分页查询 高血压患者随访表")
......
smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/model/HpSatisfaction.java 0 → 100644
View file @ 9b37b63f
package cn.sh.stc.sict.theme.hphy.model;
import lombok.Data;
import java.util.Date;
@Data
public class HpSatisfaction {
private Long id;
private Long userId;
private String userName;
private String path;
private String content;
private Byte status;
private String feedBack;
private Date createTime;
private Date updateTime;
}
smart-health-modules/theme-schema/src/main/resources/bootstrap-dev.yml
View file @ 9b37b63f
server:
port: 10253
port: 12253
spring:
application:
......@@ -9,7 +9,7 @@ spring:
# nacos
cloud:
nacos:
server-addr: 173.18.1.63:8848
server-addr: 127.0.0.1:8848
discovery:
namespace: bbe7ca0d-f409-4e68-bf95-5f2adad168e7
config:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment