From 9b37b63f114105265872b456dd1a27d581506a7a Mon Sep 17 00:00:00 2001
From: fshenye <512914587@qq.com>
Date: Tue, 11 Jan 2022 16:11:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E4=B8=89=E8=A7=92api=E6=96=87?=
=?UTF-8?q?=E6=A1=A3=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
cloud-auth/pom.xml | 2 +-
.../src/main/resources/bootstrap-dev.yml | 4 +--
.../src/main/resources/bootstrap-hp.yml | 2 +-
cloud-common/cloud-common-bom/pom.xml | 2 +-
cloud-common/cloud-common-core/pom.xml | 2 +-
.../core/constant/RedisCacheConstant.java | 2 +-
cloud-common/cloud-common-data/pom.xml | 2 +-
.../cloud-common-dynamic-gateway/pom.xml | 2 +-
cloud-common/cloud-common-gateway/pom.xml | 2 +-
cloud-common/cloud-common-log/pom.xml | 2 +-
cloud-common/cloud-common-minio/pom.xml | 2 +-
cloud-common/cloud-common-security/pom.xml | 2 +-
cloud-common/cloud-common-swagger/pom.xml | 2 +-
cloud-common/pom.xml | 2 +-
cloud-gateway/pom.xml | 2 +-
.../src/main/resources/bootstrap-dev.yml | 4 +--
pom.xml | 4 +--
.../cloud-upms/cloud-upms-api/pom.xml | 2 +-
.../cloud-upms/cloud-upms-biz/pom.xml | 2 +-
.../upms/config/DynamicRouteInitRunner.java | 6 ++--
.../cloud/upms/config/WxMpConfiguration.java | 2 ++
.../controller/web/SysUserBaseController.java | 1 -
.../src/main/resources/bootstrap-dev.yml | 4 +--
.../src/main/resources/logback-spring.xml | 2 +-
smart-health-modules/cloud-upms/pom.xml | 2 +-
smart-health-modules/pom.xml | 2 +-
smart-health-modules/theme-schema/pom.xml | 2 +-
.../common/controller/MessageController.java | 29 +++++++++++++++++++
.../hphy/controller/mp/HphyEvaController.java | 2 +-
.../hphy/controller/mp/IndexController.java | 27 +++++++++++++++++
.../hphy/controller/mp/WDController.java | 8 ++++-
.../web/HphyPatientFollowInfoController.java | 3 +-
.../sict/theme/hphy/model/HpSatisfaction.java | 18 ++++++++++++
.../src/main/resources/bootstrap-dev.yml | 4 +--
.../src/main/resources/bootstrap-hp.yml | 2 +-
35 files changed, 119 insertions(+), 39 deletions(-)
create mode 100644 smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/common/controller/MessageController.java
create mode 100644 smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/IndexController.java
create mode 100644 smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/model/HpSatisfaction.java
diff --git a/cloud-auth/pom.xml b/cloud-auth/pom.xml
index f7dfdc2..b15e004 100644
--- a/cloud-auth/pom.xml
+++ b/cloud-auth/pom.xml
@@ -6,7 +6,7 @@
cn.sh.stc.sict
cloud-parent
- 1.0.0
+ 1.2.0
cloud-auth
diff --git a/cloud-auth/src/main/resources/bootstrap-dev.yml b/cloud-auth/src/main/resources/bootstrap-dev.yml
index a95b79b..c0d208c 100644
--- a/cloud-auth/src/main/resources/bootstrap-dev.yml
+++ b/cloud-auth/src/main/resources/bootstrap-dev.yml
@@ -1,5 +1,5 @@
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:
diff --git a/cloud-auth/src/main/resources/bootstrap-hp.yml b/cloud-auth/src/main/resources/bootstrap-hp.yml
index f5db4fb..21cac24 100644
--- a/cloud-auth/src/main/resources/bootstrap-hp.yml
+++ b/cloud-auth/src/main/resources/bootstrap-hp.yml
@@ -1,5 +1,5 @@
server:
- port: 10254
+ port: 12254
spring:
application:
diff --git a/cloud-common/cloud-common-bom/pom.xml b/cloud-common/cloud-common-bom/pom.xml
index 8e1110a..2b6e2df 100644
--- a/cloud-common/cloud-common-bom/pom.xml
+++ b/cloud-common/cloud-common-bom/pom.xml
@@ -16,7 +16,7 @@
公共版本控制
- 1.0.0
+ 1.2.0
2.9.6
3.3.2
8.0.15
diff --git a/cloud-common/cloud-common-core/pom.xml b/cloud-common/cloud-common-core/pom.xml
index 05a61bc..ff0d896 100644
--- a/cloud-common/cloud-common-core/pom.xml
+++ b/cloud-common/cloud-common-core/pom.xml
@@ -5,7 +5,7 @@
cloud-common
cn.sh.stc.sict
- 1.0.0
+ 1.2.0
4.0.0
diff --git a/cloud-common/cloud-common-core/src/main/java/cn/sh/stc/sict/cloud/common/core/constant/RedisCacheConstant.java b/cloud-common/cloud-common-core/src/main/java/cn/sh/stc/sict/cloud/common/core/constant/RedisCacheConstant.java
index 53ff977..2a2244a 100644
--- a/cloud-common/cloud-common-core/src/main/java/cn/sh/stc/sict/cloud/common/core/constant/RedisCacheConstant.java
+++ b/cloud-common/cloud-common-core/src/main/java/cn/sh/stc/sict/cloud/common/core/constant/RedisCacheConstant.java
@@ -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";
/**
* 验证码前缀
diff --git a/cloud-common/cloud-common-data/pom.xml b/cloud-common/cloud-common-data/pom.xml
index be7220d..429e0bb 100644
--- a/cloud-common/cloud-common-data/pom.xml
+++ b/cloud-common/cloud-common-data/pom.xml
@@ -5,7 +5,7 @@
cloud-common
cn.sh.stc.sict
- 1.0.0
+ 1.2.0
4.0.0
diff --git a/cloud-common/cloud-common-dynamic-gateway/pom.xml b/cloud-common/cloud-common-dynamic-gateway/pom.xml
index 4f0d25b..4be7019 100644
--- a/cloud-common/cloud-common-dynamic-gateway/pom.xml
+++ b/cloud-common/cloud-common-dynamic-gateway/pom.xml
@@ -5,7 +5,7 @@
cloud-common
cn.sh.stc.sict
- 1.0.0
+ 1.2.0
4.0.0
diff --git a/cloud-common/cloud-common-gateway/pom.xml b/cloud-common/cloud-common-gateway/pom.xml
index d843c1a..85b7d77 100644
--- a/cloud-common/cloud-common-gateway/pom.xml
+++ b/cloud-common/cloud-common-gateway/pom.xml
@@ -5,7 +5,7 @@
cloud-common
cn.sh.stc.sict
- 1.0.0
+ 1.2.0
4.0.0
diff --git a/cloud-common/cloud-common-log/pom.xml b/cloud-common/cloud-common-log/pom.xml
index 0f54da9..bfbcbc9 100644
--- a/cloud-common/cloud-common-log/pom.xml
+++ b/cloud-common/cloud-common-log/pom.xml
@@ -5,7 +5,7 @@
cloud-common
cn.sh.stc.sict
- 1.0.0
+ 1.2.0
4.0.0
diff --git a/cloud-common/cloud-common-minio/pom.xml b/cloud-common/cloud-common-minio/pom.xml
index 555e12f..37c3722 100644
--- a/cloud-common/cloud-common-minio/pom.xml
+++ b/cloud-common/cloud-common-minio/pom.xml
@@ -5,7 +5,7 @@
cloud-common
cn.sh.stc.sict
- 1.0.0
+ 1.2.0
4.0.0
diff --git a/cloud-common/cloud-common-security/pom.xml b/cloud-common/cloud-common-security/pom.xml
index e53fba4..0d6be0d 100644
--- a/cloud-common/cloud-common-security/pom.xml
+++ b/cloud-common/cloud-common-security/pom.xml
@@ -6,7 +6,7 @@
cn.sh.stc.sict
cloud-common
- 1.0.0
+ 1.2.0
cloud-common-security
diff --git a/cloud-common/cloud-common-swagger/pom.xml b/cloud-common/cloud-common-swagger/pom.xml
index d7124bd..5172696 100644
--- a/cloud-common/cloud-common-swagger/pom.xml
+++ b/cloud-common/cloud-common-swagger/pom.xml
@@ -5,7 +5,7 @@
cloud-common
cn.sh.stc.sict
- 1.0.0
+ 1.2.0
4.0.0
diff --git a/cloud-common/pom.xml b/cloud-common/pom.xml
index 1da7266..8256c59 100644
--- a/cloud-common/pom.xml
+++ b/cloud-common/pom.xml
@@ -5,7 +5,7 @@
cloud-parent
cn.sh.stc.sict
- 1.0.0
+ 1.2.0
4.0.0
diff --git a/cloud-gateway/pom.xml b/cloud-gateway/pom.xml
index 180b4d5..fe0ebe9 100644
--- a/cloud-gateway/pom.xml
+++ b/cloud-gateway/pom.xml
@@ -5,7 +5,7 @@
cloud-parent
cn.sh.stc.sict
- 1.0.0
+ 1.2.0
4.0.0
diff --git a/cloud-gateway/src/main/resources/bootstrap-dev.yml b/cloud-gateway/src/main/resources/bootstrap-dev.yml
index 3cfc8b1..c5477f9 100644
--- a/cloud-gateway/src/main/resources/bootstrap-dev.yml
+++ b/cloud-gateway/src/main/resources/bootstrap-dev.yml
@@ -1,5 +1,5 @@
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:
diff --git a/pom.xml b/pom.xml
index 3b90e1b..c3be02b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
cn.sh.stc.sict
cloud-parent
pom
- 1.0.0
+ 1.2.0
cloud-common
@@ -158,7 +158,7 @@
- ${project.name}
+
src/main/resources
diff --git a/smart-health-modules/cloud-upms/cloud-upms-api/pom.xml b/smart-health-modules/cloud-upms/cloud-upms-api/pom.xml
index 281d677..3fb9993 100644
--- a/smart-health-modules/cloud-upms/cloud-upms-api/pom.xml
+++ b/smart-health-modules/cloud-upms/cloud-upms-api/pom.xml
@@ -5,7 +5,7 @@
cloud-upms
cn.sh.stc.sict
- 1.0.0
+ 1.2.0
4.0.0
diff --git a/smart-health-modules/cloud-upms/cloud-upms-biz/pom.xml b/smart-health-modules/cloud-upms/cloud-upms-biz/pom.xml
index 455ba79..f145153 100644
--- a/smart-health-modules/cloud-upms/cloud-upms-biz/pom.xml
+++ b/smart-health-modules/cloud-upms/cloud-upms-biz/pom.xml
@@ -5,7 +5,7 @@
cloud-upms
cn.sh.stc.sict
- 1.0.0
+ 1.2.0
4.0.0
diff --git a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/config/DynamicRouteInitRunner.java b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/config/DynamicRouteInitRunner.java
index 2d970d4..43560b5 100644
--- a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/config/DynamicRouteInitRunner.java
+++ b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/config/DynamicRouteInitRunner.java
@@ -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("初始化网关路由结束 ");
}
/**
diff --git a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/config/WxMpConfiguration.java b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/config/WxMpConfiguration.java
index 4ee2b3f..4a08b1b 100644
--- a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/config/WxMpConfiguration.java
+++ b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/config/WxMpConfiguration.java
@@ -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;
diff --git a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/web/SysUserBaseController.java b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/web/SysUserBaseController.java
index bd857ab..94a5760 100644
--- a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/web/SysUserBaseController.java
+++ b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/web/SysUserBaseController.java
@@ -120,7 +120,6 @@ public class SysUserBaseController {
if (NumberUtil.isNullOrZero(dto.getUser().getId())) {
return new R().error("用户id不可为空!");
}
-
sysUserBaseService.saveDto(dto);
return new R();
}
diff --git a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/resources/bootstrap-dev.yml b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/resources/bootstrap-dev.yml
index 90a4ea1..32afb69 100644
--- a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/resources/bootstrap-dev.yml
+++ b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/resources/bootstrap-dev.yml
@@ -1,5 +1,5 @@
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:
diff --git a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/resources/logback-spring.xml b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/resources/logback-spring.xml
index 316f3d2..66c1dd8 100644
--- a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/resources/logback-spring.xml
+++ b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/resources/logback-spring.xml
@@ -63,7 +63,7 @@
-
+
diff --git a/smart-health-modules/cloud-upms/pom.xml b/smart-health-modules/cloud-upms/pom.xml
index 01b8403..d2c1069 100644
--- a/smart-health-modules/cloud-upms/pom.xml
+++ b/smart-health-modules/cloud-upms/pom.xml
@@ -5,7 +5,7 @@
smart-health-modules
cn.sh.stc.sict
- 1.0.0
+ 1.2.0
4.0.0
diff --git a/smart-health-modules/pom.xml b/smart-health-modules/pom.xml
index 51b1a29..54a5386 100644
--- a/smart-health-modules/pom.xml
+++ b/smart-health-modules/pom.xml
@@ -5,7 +5,7 @@
cloud-parent
cn.sh.stc.sict
- 1.0.0
+ 1.2.0
4.0.0
pom
diff --git a/smart-health-modules/theme-schema/pom.xml b/smart-health-modules/theme-schema/pom.xml
index ff4e675..dbf265a 100644
--- a/smart-health-modules/theme-schema/pom.xml
+++ b/smart-health-modules/theme-schema/pom.xml
@@ -5,7 +5,7 @@
smart-health-modules
cn.sh.stc.sict
- 1.0.0
+ 1.2.0
theme-schema
主题库
diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/common/controller/MessageController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/common/controller/MessageController.java
new file mode 100644
index 0000000..f8ef93c
--- /dev/null
+++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/common/controller/MessageController.java
@@ -0,0 +1,29 @@
+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();
+ }
+}
diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/HphyEvaController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/HphyEvaController.java
index fc4d36b..7c6ebf7 100644
--- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/HphyEvaController.java
+++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/HphyEvaController.java
@@ -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,
diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/IndexController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/IndexController.java
new file mode 100644
index 0000000..acc4241
--- /dev/null
+++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/IndexController.java
@@ -0,0 +1,27 @@
+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();
+ }
+}
diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/WDController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/WDController.java
index fa7d7e9..6900df1 100644
--- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/WDController.java
+++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/WDController.java
@@ -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();
+ }
}
diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/HphyPatientFollowInfoController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/HphyPatientFollowInfoController.java
index fe2c2bd..e089d0a 100644
--- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/HphyPatientFollowInfoController.java
+++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/HphyPatientFollowInfoController.java
@@ -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("分页查询 高血压患者随访表")
diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/model/HpSatisfaction.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/model/HpSatisfaction.java
new file mode 100644
index 0000000..92e10ad
--- /dev/null
+++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/model/HpSatisfaction.java
@@ -0,0 +1,18 @@
+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;
+}
diff --git a/smart-health-modules/theme-schema/src/main/resources/bootstrap-dev.yml b/smart-health-modules/theme-schema/src/main/resources/bootstrap-dev.yml
index 9713a6f..99dbf7b 100644
--- a/smart-health-modules/theme-schema/src/main/resources/bootstrap-dev.yml
+++ b/smart-health-modules/theme-schema/src/main/resources/bootstrap-dev.yml
@@ -1,5 +1,5 @@
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:
diff --git a/smart-health-modules/theme-schema/src/main/resources/bootstrap-hp.yml b/smart-health-modules/theme-schema/src/main/resources/bootstrap-hp.yml
index 220482c..00e7035 100644
--- a/smart-health-modules/theme-schema/src/main/resources/bootstrap-hp.yml
+++ b/smart-health-modules/theme-schema/src/main/resources/bootstrap-hp.yml
@@ -1,5 +1,5 @@
server:
- port: 10253
+ port: 12253
spring:
application:
--
2.22.0