diff --git a/cloud-auth/pom.xml b/cloud-auth/pom.xml
index f7dfdc288401301d2fc2f0f3126fe0ea77ffb768..b15e004aef7927649af930f36b7ea74d5a6631e7 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 a95b79bc730a0d7fc6e1fc041900f59aa6415b60..c0d208c7aa3272b717746a2bcfe67226b976427f 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 f5db4fb29d532a4a78642f2bce7c9c0dca971677..21cac2464e4ad8461edfbbed346e1af254840284 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 8e1110a21e4cc0c747e39655dcd2764619351279..2b6e2df628c2d0fa0b426d00958f0af8d829094f 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 05a61bcc5a3762cd32641253f5987a0d14a28c31..ff0d896f5b9ebbd4ff6b5d59c2579dc022a09d98 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 53ff977465a9aaff2f5e547059a2d725175c713c..2a2244ac062685e4e2fdd05991ca4f03d94abd89 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 be7220d86dcfdfdd4b245ed9fe51495048d5ebb7..429e0bbe883eb976b058077a1ed1385d1e2dc962 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 4f0d25b8bae37d746df390de1184245689378bc6..4be7019cdb305264d1754f13c592bbc5b2899663 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 d843c1a2f373ead6b0702e81efc6942fead599ba..85b7d774db3d462596b199c02664a75572927403 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 0f54da99a09c258fcdf9d3d4019327ebf409efc2..bfbcbc9454e9b2e61c89f3f30e2e52b2ca7f11cd 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 555e12ff83a085a1a7df51f45313a1cdf9c24210..37c37224ef821bd8481ae63e71d8f88e92792dfb 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 e53fba406adbc094b0420624316b51b69b5f2a4c..0d6be0dbda09526f288d359d45101a5008adf05e 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 d7124bd81052d088ce1e8635a2c137f711f3c054..5172696097c683941c411c025f8dd9ebfaede5eb 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 1da7266494c8d6d159218e5644fc7e14834d79fa..8256c591534eb19aebae3f0191f49037de21bdae 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 180b4d59e79f5a373add6757fdbfd75f0b82bfec..fe0ebe9d6722b996d73afdfb4686455fcdca8f77 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 3cfc8b144e48ead9955f023d02749b26f95c5821..c5477f9e81b09629f388ad2a4862d50755fa82a7 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 3b90e1b3c50825dc977616ef1cb873fa6cba63a4..c3be02bf6dad4e0874672b1c663a55fc2be4d638 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 281d677a11d864f95d62f4993e88c0ce86d79e72..3fb999383f8f99de844e77e4714a24c5570331ed 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 455ba79ddb538583d115e07d1dc36ac5aa3710c2..f145153482a123eb0d4bb45807d2d3666103f48c 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 2d970d4878fdf8cc1d9176cfa511247d5e72a61d..43560b58f6718eff07d65fd9a32e922e4b20503c 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 4ee2b3f6b3f1fa9dbef845640e1de5d7898bded8..4a08b1b2c2a471d8e7ac9a9d33a5fe20b86604e7 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 bd857ab8c1b35287880a014e33277d28563b1c93..94a576095f74f36bdf6a0195f852948f120c8820 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 90a4ea171cfff406e21b925e3e8be8724daaeb5a..32afb699954d73405537acb92e26512d5e81b75f 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 316f3d24706d6e7a7a2abbab2b1c18626a524a45..66c1dd8cf7461a6adbab42c60883b635cdfa2530 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 01b8403e16655ef49a620e3a33bffe6f9ae3175c..d2c1069589f9095a594883a7b62d4f7cbb2b83be 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 51b1a299fdf373fb7141da8c41c944dc15cce31f..54a53861cab96bc577ba6e6042ab11c6f9aad4f9 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 ff4e6751e11fbc28e607b20d8c4df6270663d9f8..dbf265a582bf64fb8c5e686ab2124587da04a263 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 0000000000000000000000000000000000000000..f8ef93cc603396d4656b8e339ec7de86df73f51c
--- /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 fc4d36b2902bf494c728c25f069ffcaaf2904138..7c6ebf705814fd09284425c0e352c525be2f9b5a 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 0000000000000000000000000000000000000000..acc424118641a0aad57e0e351dea169c84e79005
--- /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 fa7d7e9cb179a665e6da651f9cb4b6139d00597f..6900df1a88696ad895e89b8059a44a7f8b334994 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 fe2c2bdfdf037767575beac6127feefa083fac14..e089d0aaef4f50be139a0abd367969686b79d127 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 0000000000000000000000000000000000000000..92e10adf5a672f6888f9c43173782502f0733291
--- /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 9713a6f96e5ab8fdc6f189752323f6320045a31c..99dbf7bcb70704a939ac632b0f49934628d2c320 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 220482c9df5e74ce603e68c174b5aa7bbcdda9b9..00e7035922a312720c8bbb9b17e92529a74b19ac 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: