From c3ccd3b9002052ed6d4d37fdfd5913927f8741ae Mon Sep 17 00:00:00 2001
From: zhangye <654600784@qq.com>
Date: Wed, 25 Mar 2020 16:53:44 +0800
Subject: [PATCH] 0325.1

---
 .../java/com/ccsens/health/service/AbnormalService.java   | 1 +
 .../main/java/com/ccsens/health/service/UserService.java  | 8 ++++----
 health/src/main/resources/application.yml                 | 4 ++--
 tall/src/main/resources/application.yml                   | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/health/src/main/java/com/ccsens/health/service/AbnormalService.java b/health/src/main/java/com/ccsens/health/service/AbnormalService.java
index 3ee49e4f..7333f2bf 100644
--- a/health/src/main/java/com/ccsens/health/service/AbnormalService.java
+++ b/health/src/main/java/com/ccsens/health/service/AbnormalService.java
@@ -69,6 +69,7 @@ public class AbnormalService implements IAbnormalService{
         HealthAbnormal healthAbnormal = new HealthAbnormal();
         healthAbnormal.setId(snowflake.nextId());
         BeanUtil.copyProperties(addAbnormal,healthAbnormal);
+        healthAbnormal.setHealthStatus((short) addAbnormal.getHealthType());
         healthAbnormalDao.insertSelective(healthAbnormal);
 
         AbnormalVo.AbnormalStatisticsVo abnormalStatisticsVo = new AbnormalVo.AbnormalStatisticsVo();
diff --git a/health/src/main/java/com/ccsens/health/service/UserService.java b/health/src/main/java/com/ccsens/health/service/UserService.java
index 7461fc0d..deff7a07 100644
--- a/health/src/main/java/com/ccsens/health/service/UserService.java
+++ b/health/src/main/java/com/ccsens/health/service/UserService.java
@@ -66,10 +66,10 @@ public class UserService implements IUserService{
         if(ObjectUtil.isNotNull(selectUser.getUserId())){
             userId = selectUser.getUserId();
         }else {
-            String id = tallFeignClient.getUserId(selectUser.getToken());
-            if(StrUtil.isNotEmpty(id)){
-                userId = Long.valueOf(id);
-            }
+//            String id = tallFeignClient.getUserId(selectUser.getToken());
+//            if(StrUtil.isNotEmpty(id)){
+                userId = params.getUserId();
+//            }
         }
 
         if(ObjectUtil.isNull(userId)){
diff --git a/health/src/main/resources/application.yml b/health/src/main/resources/application.yml
index c3b11fb6..5abf2423 100644
--- a/health/src/main/resources/application.yml
+++ b/health/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
+    active: prod
+    include: common, util-prod
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index af245946..1d881c2f 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: prod
-    include: util-prod,common
\ No newline at end of file
+    active: dev
+    include: util-dev,common
\ No newline at end of file