From 55e7732de21f1a7cff5ba6e7ac70fd98a6422a15 Mon Sep 17 00:00:00 2001
From: 31353 <31353751672@qq.com>
Date: Sun, 17 Dec 2023 10:57:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=A0=E8=80=80=E4=B8=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/encodings.xml                           |  2 +
 .idea/workspace.xml                           | 54 +++++++------------
 .../service/impl/HealthServiceImpl.java       | 11 ++--
 bwie-modules/pom.xml                          |  1 +
 4 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 0c13aff..4c550d0 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -7,7 +7,9 @@
     <file url="file://$PROJECT_DIR$/bwie-common/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/bwie-gateway/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/bwie-gateway/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/bwie-modules/bwie-health/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/bwie-modules/bwie-user/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/bwie-modules/bwie-user/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/bwie-modules/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/bwie-modules/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9791238..c52600d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,20 +5,6 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="22f6834d-badb-4960-b20c-230dd62138eb" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/bwie-common/src/main/java/com/bwie/common/domain/Health.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/bwie-modules/bwie-health/.gitignore" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/bwie-modules/bwie-health/pom.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/bwie-modules/bwie-health/src/main/java/com/bwie/health/HealthApplication.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/bwie-modules/bwie-health/src/main/java/com/bwie/health/controller/HealthController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/bwie-modules/bwie-health/src/main/java/com/bwie/health/mapper/HealthMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/bwie-modules/bwie-health/src/main/java/com/bwie/health/service/HealthService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/bwie-modules/bwie-health/src/main/java/com/bwie/health/service/impl/HealthServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/bwie-modules/bwie-health/src/main/resources/bootstrap.yml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/bwie-modules/bwie-health/src/main/resources/mapper/HealthMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/bwie-modules/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/bwie-modules/pom.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -46,27 +32,27 @@
     <option name="showLibraryContents" value="true" />
     <option name="showVisibilityIcons" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RequestMappingsPanelOrder0": "0",
-    "RequestMappingsPanelOrder1": "1",
-    "RequestMappingsPanelWidth0": "75",
-    "RequestMappingsPanelWidth1": "75",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "git-widget-placeholder": "master",
-    "jdk.selected.JAVA_MODULE": "1.8",
-    "last_opened_file_path": "Z:/JavaHeathl/bwie-modules/bwie-health/src/main/resources",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
+    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
+    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
+    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;jdk.selected.JAVA_MODULE&quot;: &quot;1.8&quot;,
+    &quot;last_opened_file_path&quot;: &quot;Z:/JavaHeathl/bwie-modules/bwie-health/src/main/resources&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
   </component>
diff --git a/bwie-modules/bwie-health/src/main/java/com/bwie/health/service/impl/HealthServiceImpl.java b/bwie-modules/bwie-health/src/main/java/com/bwie/health/service/impl/HealthServiceImpl.java
index c7fa252..69eb2a4 100644
--- a/bwie-modules/bwie-health/src/main/java/com/bwie/health/service/impl/HealthServiceImpl.java
+++ b/bwie-modules/bwie-health/src/main/java/com/bwie/health/service/impl/HealthServiceImpl.java
@@ -3,6 +3,7 @@ package com.bwie.health.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.bwie.common.constants.TokenConstants;
 import com.bwie.common.domain.Health;
+import com.bwie.common.domain.User;
 import com.bwie.common.result.Result;
 import com.bwie.common.utils.JwtUtils;
 import com.bwie.health.mapper.HealthMapper;
@@ -38,11 +39,11 @@ public class HealthServiceImpl implements HealthService{
     /*健康教育信息录入*/
     @Override
     public Result<Integer> addHealth(Health health) {
-//        String token1 = request.getHeader("token");
-//        String userKey = JwtUtils.getUserKey(token1);
-//        String token = redisTemplate.opsForValue().get(TokenConstants.LOGIN_TOKEN_KEY+userKey);
-//        User o = JSONObject.parseObject(token, User.class);
-//        health.setUserId(o.Id);
+        String token1 = request.getHeader("token");
+        String userKey = JwtUtils.getUserKey(token1);
+        String token = redisTemplate.opsForValue().get(TokenConstants.LOGIN_TOKEN_KEY+userKey);
+        User o = JSONObject.parseObject(token, User.class);
+        health.setUserId(o.getId());
 
         Integer i = healthMapper.addHealth(health);
 
diff --git a/bwie-modules/pom.xml b/bwie-modules/pom.xml
index b672a17..d59054f 100644
--- a/bwie-modules/pom.xml
+++ b/bwie-modules/pom.xml
@@ -13,6 +13,7 @@
     <packaging>pom</packaging>
     <modules>
         <module>bwie-user</module>
+        <module>bwie-health</module>
     </modules>
 
     <properties>