feat.liao.2.8

.history/docs-prod/schema_20241223191830.md

@@ -0,0 +1,282 @@
+# //陪聊部分
+# 类图
+```plantuml
+' 聊天项目类图英文版
+@startuml
+
+class _User { 
+    + objectId: String //用户唯一标识符
+    + username: String //用户名
+    + realname: String //真实姓名
+    + password: String //用户密码
+    + gender: String //性别
+    + age: Number //年龄
+    + email: String //用户邮箱
+    + avatar: String //用户头像
+    + startChat(): void 
+    + chooseChatPartner(): String
+    + summarizeChatHistory(): void
+}
+
+class ChatPartner {
+    + objectId: String //陪聊师唯一标识符
+    + name: String //陪聊师姓名
+    + expertise: String //陪聊师专业领域
+    + avatar: String //陪聊师头像
+    + bio: String //陪聊师个人简介
+    + provideChat(): String 
+}
+
+class ChatCompanion {
+    + objectId: String //聊天伙伴唯一标识符
+    + name: String //聊天伙伴姓名
+    + avatar: String //聊天伙伴头像
+    + bio: String //聊天伙伴个人简介
+    + provideChat(): String
+}
+
+class ChatRecord {
+    + objectId: String //聊天记录唯一标识符
+    + title:String //聊天标题
+    + content：Array //聊天内容
+    + user: Pointer<User> //关联的用户对象
+    + chatpartner: Pointer<ChatPartner> //关联的聊天机器人对象
+    + getChatHistory(): List
+}
+
+class ChatReport {
+    + objectId: String //报告唯一标识符
+    - report: String //分析结果
+    + generateReport(): String //生成报告的方法
+}
+class ChatEvaluate{
+    + objectId:String//评论唯一标识符
+    + avater:String//用户头像
+    + content:String//评论内容
+    + rating:Number//评论星星数
+    + user: Pointer<User> //关联的用户对象
+}
+
+_User "*" --> "*" ChatEvaluate
+_User "1" --> "*" ChatRecord     
+ChatPartner "1" --> "*" ChatRecord 
+ChatCompanion "1" --> "*" ChatRecord 
+ChatRecord "1" --> "1" ChatReport      
+@enduml
+```
+# 时序图
+```plantuml
+@startuml
+actor 用户
+participant "专业陪聊师" as 专业陪聊师
+participant "普通陪聊师" as 普通陪聊师
+participant "聊天记录" as 聊天记录
+participant "报告" as 报告
+
+用户 -> 用户: 选择陪聊师()
+alt 选择专业陪聊师
+    用户 -> 专业陪聊师: 提供聊天()
+else 选择普通陪聊师
+    用户 -> 普通陪聊师: 提供聊天()
+end
+用户 -> 用户: 开始聊天()
+用户 -> 聊天记录: 总结聊天记录()
+聊天记录 -> 聊天记录: 获取聊天记录()
+
+聊天记录 -> 报告: 生成报告()
+报告 -> 用户: 返回分析报告
+
+@enduml
+```
+
+# 状态图
+```plantuml
+@startuml
+[*] --> 选择陪聊师
+
+选择陪聊师 -->  聊天中: 开始聊天
+聊天中 --> 继续聊天 : 选择继续聊天
+聊天中 --> 退出聊天 : 选择退出聊天
+退出聊天 --> 总结中 : 总结聊天记录
+
+总结中 --> 生成报告 : 生成分析报告
+生成报告 --> 生成失败 : 报告生成失败
+生成报告 --> 生成成功 : 报告生成成功
+
+生成成功 --> [*] : 聊天结束
+生成失败 --> 生成报告 : 重新生成
+@enduml
+```
+
+# 活动图
+```plantuml
+@startuml
+|用户|
+start
+:发送消息;
+|专业陪聊机器人|
+:回复消息;
+|用户|
+repeat
+if (继续聊天?) then (是)
+    |用户|
+    :发送消息;
+    |专业陪聊机器人|
+    :回复消息;
+else (否)
+    |管理员|
+    :记录消息;
+    stop
+endif
+repeat while (回复消息)
+@enduml
+
+```
+
+# //社区部分
+
+
+# 用例图
+```plantuml
+@startuml
+actor 学生用户
+actor 学校管理员
+
+rectangle "心理社区" {
+    学生用户 -- (填写心理普查问卷)
+    学生用户 -- (使用心理测试)
+    学校管理员 -- (发布心理普查问卷)
+    学校管理员 -- (发布心理活动通知)
+    学校管理员 -- (设置星标用户)
+}
+
+@enduml
+```
+# 类图
+
+```plantuml
+@startuml
+class User {
+    +objectId: String
+    +username: String
+    +realname: String
+    +password: String
+    +gender: String
+    +age: Number
+    +email: String
+    +avatar: String
+    +startChat():void
+    +chooseChatPartner():String
+    +summarizeCharHistory():void
+    +registerAccount():void
+    +login(): void
+    +fillPsychologicalTest(): void
+    +publishBottle(): void
+    +retrieveBottle(): Bottle
+}
+
+class PsychologicalCommunity {
+    +communityID: String
+    +topic: String
+    +joinCommunity(): void
+}
+
+class PsychologicalActivity {
+    +activityID: String
+    +title: String
+    +description: String
+    +date: Date
+    +location: String
+    +publishActivity(): void
+}
+
+class PsychologicalSurvey {
+    +surveyID: String
+    +content: String
+    +publisher: SchoolAdmin
+    +responses: List
+    +publishSurvey(): void
+    +analyzeResults(): void
+}
+
+class SchoolAdmin {
+    +adminID: String
+    +name: String
+    +email: String
+    +publishPsychologicalActivity(): void
+    +publishPsychologicalSurvey(): void
+    +analyzeSurveyResults(): void
+    +setFeaturedUser(): void
+}
+
+class Bottle {
+    +bottleID: String
+    +content: String
+    +author: User
+    +timestamp: Date
+}
+
+User "1" -- "0..*" PsychologicalCommunity
+PsychologicalActivity "1" -- "0..*" User
+SchoolAdmin "1" -- "0..*" PsychologicalActivity
+SchoolAdmin "1" -- "0..*" PsychologicalSurvey
+PsychologicalSurvey "1" -- "0..*" User
+User "1" -- "0..*" Bottle
+@enduml
+```
+
+# 时序图
+
+```mermaid
+sequenceDiagram
+    participant Admin as 学校管理员
+    participant Student as 学生用户
+    participant System as 系统
+
+    Admin->>System: 发布心理普查问卷
+    Student->>System: 填写心理普查问卷
+    System->>Admin: 收集问卷结果
+    Admin->>System: 分析问卷结果
+    alt 心理健康有问题的学生人数达到阈值
+        System->>Admin: 发布心理团辅
+        System->>Student: 升级为心理星标用户
+    end
+    Admin->>System: 制定后续心理活动
+    System->>Student: 通知学生参与活动
+    Student->>System: 使用心理测试
+```
+# 活动图
+
+```mermaid
+graph TD
+    A[开始] --> B[发布心理普查问卷]
+    B --> C[学生填写问卷]
+    C --> D[提交问卷]
+    D --> E[学校管理员分析结果]
+    E --> F{心理健康有问题的学生人数达到阈值?}
+    F -->|是| G[发布心理团辅]
+    F -->|否| H[继续监控]
+    G --> I[通知学生参与团辅]
+    E --> J[设置星标用户]
+    J --> K
+    H --> K
+    I --> K[结束]
+```
+
+# 状态图
+```mermaid
+stateDiagram-v2
+    [*] --> 发布问卷
+    发布问卷 --> 问卷收集中: 学生填写问卷
+    问卷收集中 --> 结果分析中: 提交问卷
+    结果分析中 --> 后续活动设计中: 学校管理员查看分析
+    结果分析中 --> 初期活动发布中: 心理状况有问题学生人数达到阈值
+    初期活动发布中 --> 团辅进行中: 发布心理团辅
+    初期活动发布中 --> 升级星标用户: 升级为心理星标用户
+    后续活动设计中 --> 后续活动开展中: 发布后续活动
+    后续活动开展中 --> [*]
+    团辅进行中 --> [*]
+    升级星标用户 --> [*]
+    
+```
+

.history/soul-app/src/app/page-psysurvey/page-psysurvey.component_20241223214953.html

@@ -0,0 +1,35 @@
+<ion-header>
+  <ion-toolbar>
+    <div class="toolbar-content">
+      <div class="button-container">
+        <ion-button (click)="goTab1()" fill="clear">
+          <ion-icon name="chevron-back" slot="start"></ion-icon>返回
+        </ion-button>
+      </div>
+      <ion-title class="title-text">
+        心理普查
+      </ion-title>
+    </div>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content [fullscreen]="true">
+<section *ngIf="filteredSurveys.length > 0">
+  <ion-card *ngFor="let survey of filteredSurveys">
+    <ion-card-header>
+      <ion-card-title>{{ survey.title }}</ion-card-title>
+    </ion-card-header>
+    <ion-card-content>
+      <p>链接: <a [href]="survey.link" target="_blank">{{ survey.link }}</a></p>
+    </ion-card-content>
+  </ion-card>
+</section>
+
+  <div  style="display: flex; justify-content: center; margin-top: auto;">
+    <ion-button (click)="goPublishSurvey()" expand="full">
+      发布问卷
+    </ion-button>
+  </div>
+
+
+</ion-content>

.history/soul-app/src/app/page-psysurvey/page-psysurvey.component_20241223214958.ts

@@ -0,0 +1,68 @@
+import { CommonModule } from '@angular/common';
+import { Component, OnInit, Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { IonHeader,IonButton, IonContent, IonIcon, IonItem, IonLabel, IonList, 
+  IonListHeader,IonCardHeader,IonCardTitle,IonCardContent, IonTitle,IonCard, IonToolbar,IonInput,IonSearchbar } from '@ionic/angular/standalone';
+  import { HttpClient } from '@angular/common/http';
+  import { UserService } from '../user.service'; // 确保路径正确
+
+
+  @Injectable({
+    providedIn: 'root'
+  })
+
+@Component({
+  selector: 'app-page-psysurvey',
+  templateUrl: './page-psysurvey.component.html',
+  styleUrls: ['./page-psysurvey.component.scss'],
+  standalone: true,
+  imports: [IonHeader,IonToolbar,IonTitle,IonContent,
+      IonList,IonListHeader,IonItem,IonCardTitle,
+      IonLabel,IonIcon,IonButton,IonCardContent,
+      IonInput,IonSearchbar,IonCard,IonCardHeader,
+      CommonModule,HttpClient,Injectable
+    ]
+})
+export class PagePsysurveyComponent  implements OnInit {
+  surveys: any[] = []; // 存储问卷通知
+  filteredSurveys: any[] = []; // 存储过滤后的问卷
+  userApartment: string = '' ; // 当前用户的学院
+
+  constructor(private router: Router,private http: HttpClient,private userService: UserService) { }
+  goTab1(){
+    this.router.navigate(['tabs/tab1']);
+   }
+   goPublishSurvey(){
+    this.router.navigate(['tabs/page-publishsurvey'])
+   }
+
+   ngOnInit() {
+    // 动态获取当前用户的学院信息
+    this.userService.getCurrentUser().subscribe(user => {
+      this.userApartment = user.apartment; // 从用户数据中获取学院
+      this.getSurveys(); // 在获取到用户信息后获取问卷
+    }, error => {
+      console.error('获取用户信息时出错:', error);
+      // 可以设置一个默认值或处理错误
+    });
+  }
+
+  getSurveys() {
+    this.http.get('http://127.0.0.1:4040/apps/DevServer/browser/survey').subscribe(
+      (response: any) => {
+        this.surveys = response; // 假设响应是问卷数组
+        this.filterSurveys(); // 过滤问卷
+      },
+      error => {
+        console.error('获取问卷时出错:', error);
+      }
+    );
+  }
+  filterSurveys() {
+    this.filteredSurveys = this.surveys.filter(survey => {
+      return survey.audience === this.userApartment || survey.audience === 'all';
+    });
+  }
+  
+  
+}

.history/soul-app/src/app/page-publishsurvey/page-publishsurvey.component_20241223150649.html

@@ -0,0 +1,63 @@
+<ion-header>
+  <ion-toolbar>
+    <div class="toolbar-content">
+      <div class="button-container">
+        <ion-button (click)="goTab1()" fill="clear">
+          <ion-icon name="chevron-back" slot="start"></ion-icon>返回
+        </ion-button>
+      </div>
+      <ion-title class="title-text">
+        发布问卷
+      </ion-title>
+    </div>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content [fullscreen]="true">
+  <ion-segment [(ngModel)]="category" (ionChange)="onCategoryChange()">
+    <ion-segment-button value="school">
+      学校
+    </ion-segment-button>
+    <ion-segment-button value="society">
+      社会
+    </ion-segment-button>
+  </ion-segment>
+
+  <div *ngIf="category === 'school'">
+    <ion-item>
+      <ion-label position="floating">问卷标题</ion-label>
+      <ion-input [(ngModel)]="surveyTitle"></ion-input>
+    </ion-item>
+
+    <ion-item>
+      <ion-label position="floating">问卷链接</ion-label>
+      <ion-input [(ngModel)]="surveyLink"></ion-input>
+    </ion-item>
+
+    <ion-item>
+      <ion-label>面向对象</ion-label>
+      <ion-select [(ngModel)]="targetAudience">
+        <ion-select-option value="all">全校学生</ion-select-option>
+        <ion-select-option value="软件学院">软件学院</ion-select-option>
+        <ion-select-option value="music">音乐学院</ion-select-option>
+      </ion-select>
+    </ion-item>
+
+    <ion-button expand="full" (click)="publishSurvey()">发布问卷</ion-button>
+  </div>
+
+  <div *ngIf="category === 'society'">
+    <!-- 社会问卷设置格式 -->
+    <ion-item>
+      <ion-label position="floating">社会问卷标题</ion-label>
+      <ion-input [(ngModel)]="societySurveyTitle"></ion-input>
+    </ion-item>
+
+    <ion-item>
+      <ion-label position="floating">社会问卷链接</ion-label>
+      <ion-input [(ngModel)]="societySurveyLink"></ion-input>
+    </ion-item>
+
+    <ion-button expand="full" (click)="publishSocietySurvey()">发布社会问卷</ion-button>
+  </div>
+</ion-content>

.history/soul-app/src/app/page-publishsurvey/page-publishsurvey.component_20241223214959.ts

@@ -0,0 +1,76 @@
+import { Component, OnInit,NgModule } from '@angular/core';
+import { Router } from '@angular/router';
+import { IonHeader,IonButton, IonContent, IonIcon, IonItem, IonLabel, IonList, 
+  IonListHeader,IonCardHeader,IonCardTitle,IonCardContent, IonTitle,IonCard, IonToolbar,IonInput,IonSearchbar, IonSegment, IonSegmentButton, IonSelect, IonSelectOption } from '@ionic/angular/standalone';
+  import { CommonModule } from '@angular/common';
+  import { FormsModule } from '@angular/forms';
+  import { HttpClient } from '@angular/common/http';
+
+
+@Component({
+  selector: 'app-page-publishsurvey',
+  templateUrl: './page-publishsurvey.component.html',
+  styleUrls: ['./page-publishsurvey.component.scss'],
+  standalone: true,
+  imports: [
+    IonHeader,IonToolbar,IonTitle,IonContent,IonSegment,IonSegmentButton,IonSelect,IonSelectOption,
+    IonList,IonListHeader,IonItem,IonCardTitle,HttpClient,
+    IonLabel,IonIcon,IonButton,IonCardContent,
+    IonInput,IonSearchbar,IonCard,IonCardHeader,
+    CommonModule,FormsModule
+  ]
+})
+
+
+export class PagePublishsurveyComponent  implements OnInit {
+  category: string = 'school'; // 默认类别
+  surveyTitle: string = '';
+  surveyLink: string = '';
+  targetAudience: string = 'all'; // 默认面向对象
+  // societySurveyTitle: string = '';
+  // societySurveyLink: string = '';
+
+  onCategoryChange() {
+    console.log(`当前选择的类别: ${this.category}`);
+  }
+
+  publishSurvey() {
+    console.log('发布学校问卷:');
+    console.log(`标题: ${this.surveyTitle}`);
+    console.log(`链接: ${this.surveyLink}`);
+    console.log(`面向对象: ${this.targetAudience}`);
+    // 这里可以添加逻辑将问卷发布到后端或其他处理
+    const surveyData = {
+      title: this.surveyTitle,
+      link: this.surveyLink,
+      audience: this.targetAudience,
+    };
+
+    this.http.post('http://127.0.0.1:4040/apps/DevServer/browser/survey', surveyData).subscribe(
+      response => {
+        console.log('问卷已成功发布:', response);
+        // 发布成功后可以导航到心理普查页面
+        this.router.navigate(['tabs/psysurvey']);
+      },
+      error => {
+        console.error('发布问卷时出错:', error);
+      }
+    );
+  }
+
+  // publishSocietySurvey() {
+  //   console.log('发布社会问卷:');
+  //   console.log(`标题: ${this.societySurveyTitle}`);
+  //   console.log(`链接: ${this.societySurveyLink}`);
+    // 这里可以添加逻辑将问卷发布到后端或其他处理
+  // }
+
+  constructor(private router: Router,private http: HttpClient) { }
+  goTab1(){
+    this.router.navigate(['tabs/tab1']);
+   }
+
+
+  ngOnInit() {}
+
+}

.history/soul-app/src/app/page-publishsurvey/page-publishsurvey.component_20241223220203.ts

@@ -0,0 +1,76 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { IonHeader,IonButton, IonContent, IonIcon, IonItem, IonLabel, IonList, 
+  IonListHeader,IonCardHeader,IonCardTitle,IonCardContent, IonTitle,IonCard, IonToolbar,IonInput,IonSearchbar, IonSegment, IonSegmentButton, IonSelect, IonSelectOption } from '@ionic/angular/standalone';
+  import { CommonModule } from '@angular/common';
+  import { FormsModule } from '@angular/forms';
+  import { HttpClient } from '@angular/common/http';
+
+
+@Component({
+  selector: 'app-page-publishsurvey',
+  templateUrl: './page-publishsurvey.component.html',
+  styleUrls: ['./page-publishsurvey.component.scss'],
+  standalone: true,
+  imports: [
+    IonHeader,IonToolbar,IonTitle,IonContent,IonSegment,IonSegmentButton,IonSelect,IonSelectOption,
+    IonList,IonListHeader,IonItem,IonCardTitle,HttpClient,
+    IonLabel,IonIcon,IonButton,IonCardContent,
+    IonInput,IonSearchbar,IonCard,IonCardHeader,
+    CommonModule,FormsModule
+  ]
+})
+
+
+export class PagePublishsurveyComponent  implements OnInit {
+  category: string = 'school'; // 默认类别
+  surveyTitle: string = '';
+  surveyLink: string = '';
+  targetAudience: string = 'all'; // 默认面向对象
+  // societySurveyTitle: string = '';
+  // societySurveyLink: string = '';
+
+  onCategoryChange() {
+    console.log(`当前选择的类别: ${this.category}`);
+  }
+
+  publishSurvey() {
+    console.log('发布学校问卷:');
+    console.log(`标题: ${this.surveyTitle}`);
+    console.log(`链接: ${this.surveyLink}`);
+    console.log(`面向对象: ${this.targetAudience}`);
+    // 这里可以添加逻辑将问卷发布到后端或其他处理
+    const surveyData = {
+      title: this.surveyTitle,
+      link: this.surveyLink,
+      audience: this.targetAudience,
+    };
+
+    this.http.post('http://127.0.0.1:4040/apps/DevServer/browser/survey', surveyData).subscribe(
+      response => {
+        console.log('问卷已成功发布:', response);
+        // 发布成功后可以导航到心理普查页面
+        this.router.navigate(['tabs/psysurvey']);
+      },
+      error => {
+        console.error('发布问卷时出错:', error);
+      }
+    );
+  }
+
+  // publishSocietySurvey() {
+  //   console.log('发布社会问卷:');
+  //   console.log(`标题: ${this.societySurveyTitle}`);
+  //   console.log(`链接: ${this.societySurveyLink}`);
+    // 这里可以添加逻辑将问卷发布到后端或其他处理
+  // }
+
+  constructor(private router: Router,private http: HttpClient) { }
+  goTab1(){
+    this.router.navigate(['tabs/tab1']);
+   }
+
+
+  ngOnInit() {}
+
+}

.history/soul-app/src/app/user.service_20241223213452.ts

@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class UserService {
+
+  constructor() { }
+}

.history/soul-app/src/app/user.service_20241223213959.ts

@@ -0,0 +1,17 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class UserService {
+  private apiUrl = 'http://127.0.0.1:4040/apps/DevServer/browser/survey'; // 替换为你的 API URL
+
+  constructor(private http: HttpClient) {}
+
+  // 获取当前用户信息
+  getCurrentUser(): Observable<any> {
+    return this.http.get(`${this.apiUrl}/current-user`); // 假设这个 API 返回当前用户的信息
+  }
+}

docs-prod/schema.md

@@ -156,66 +156,72 @@ rectangle "心理社区" {
 
 ```plantuml
 @startuml
-class 用户 {
-    +用户ID: String
-    +用户名: String
-    +密码: String
-    +电子邮件: String
-    +角色: String
-    +注册账户(): void
-    +登录(): void
-    +填写心理测试(): void
+class User {
+    +objectId: String
+    +username: String
+    +realname: String
+    +password: String
+    +gender: String
+    +age: Number
+    +email: String
+    +avatar: String
+    +startChat():void
+    +chooseChatPartner():String
+    +summarizeCharHistory():void
+    +registerAccount():void
+    +login(): void
+    +fillPsychologicalTest(): void
+    +publishBottle(): void
+    +retrieveBottle(): Bottle
 }
 
-class 心理社区 {
-    +社区ID: String
-    +话题: String
-    +帖子: List<帖子>
-    +加入社区(): void
-    +发布消息(): void
+class PsychologicalCommunity {
+    +communityID: String
+    +topic: String
+    +joinCommunity(): void
 }
 
-class 帖子 {
-    +帖子ID: String
-    +内容: String
-    +作者: 用户
-    +时间戳: Date
+class PsychologicalActivity {
+    +activityID: String
+    +title: String
+    +description: String
+    +date: Date
+    +location: String
+    +publishActivity(): void
 }
 
-class 心理活动 {
-    +活动ID: String
-    +标题: String
-    +描述: String
-    +日期: Date
-    +地点: String
-    +发布活动(): void
+class PsychologicalSurvey {
+    +surveyID: String
+    +content: String
+    +publisher: SchoolAdmin
+    +responses: List
+    +publishSurvey(): void
+    +analyzeResults(): void
 }
 
-class 心理普查问卷 {
-    +问卷ID: String
-    +内容: String
-    +发布者: 学校管理员
-    +填写结果: List<用户>
-    +发布问卷(): void
-    +分析结果(): void
+class SchoolAdmin {
+    +adminID: String
+    +name: String
+    +email: String
+    +publishPsychologicalActivity(): void
+    +publishPsychologicalSurvey(): void
+    +analyzeSurveyResults(): void
+    +setFeaturedUser(): void
 }
 
-class 学校管理员 {
-    +管理员ID: String
-    +姓名: String
-    +邮箱: String
-    +发布心理活动(): void
-    +发布心理普查问卷(): void
-    +分析问卷结果(): void
-    +设置星标用户(): void
+class Bottle {
+    +bottleID: String
+    +content: String
+    +author: User
+    +timestamp: Date
 }
 
-用户 "1" -- "0..*" 心理社区
-心理社区 "1" -- "0..*" 帖子
-心理活动 "1" -- "0..*" 用户
-学校管理员 "1" -- "0..*" 心理活动
-学校管理员 "1" -- "0..*" 心理普查问卷
-心理普查问卷 "1" -- "0..*" 用户
+User "1" -- "0..*" PsychologicalCommunity
+PsychologicalActivity "1" -- "0..*" User
+SchoolAdmin "1" -- "0..*" PsychologicalActivity
+SchoolAdmin "1" -- "0..*" PsychologicalSurvey
+PsychologicalSurvey "1" -- "0..*" User
+User "1" -- "0..*" Bottle
 @enduml
 ```
 

soul-app/src/app/page-psysurvey/page-psysurvey.component.html

@@ -14,17 +14,16 @@
 </ion-header>
 
 <ion-content [fullscreen]="true">
-
-  <section>
-    <ion-card>
-      <ion-card-header>
-        <ion-card-title>心理问卷调查通知</ion-card-title>
-      </ion-card-header>
-      <ion-card-content>
-        
-      </ion-card-content>
-    </ion-card>
-  </section>
+<section *ngIf="filteredSurveys.length > 0">
+  <ion-card *ngFor="let survey of filteredSurveys">
+    <ion-card-header>
+      <ion-card-title>{{ survey.title }}</ion-card-title>
+    </ion-card-header>
+    <ion-card-content>
+      <p>链接: <a [href]="survey.link" target="_blank">{{ survey.link }}</a></p>
+    </ion-card-content>
+  </ion-card>
+</section>
 
   <div  style="display: flex; justify-content: center; margin-top: auto;">
     <ion-button (click)="goPublishSurvey()" expand="full">

soul-app/src/app/page-psysurvey/page-psysurvey.component.ts

@@ -1,8 +1,15 @@
 import { CommonModule } from '@angular/common';
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { IonHeader,IonButton, IonContent, IonIcon, IonItem, IonLabel, IonList, 
   IonListHeader,IonCardHeader,IonCardTitle,IonCardContent, IonTitle,IonCard, IonToolbar,IonInput,IonSearchbar } from '@ionic/angular/standalone';
+  import { HttpClient } from '@angular/common/http';
+  import { UserService } from '../user.service'; // 确保路径正确
+
+
+  @Injectable({
+    providedIn: 'root'
+  })
 
 @Component({
   selector: 'app-page-psysurvey',
@@ -13,18 +20,49 @@ import { IonHeader,IonButton, IonContent, IonIcon, IonItem, IonLabel, IonList,
       IonList,IonListHeader,IonItem,IonCardTitle,
       IonLabel,IonIcon,IonButton,IonCardContent,
       IonInput,IonSearchbar,IonCard,IonCardHeader,
-      CommonModule
+      CommonModule,HttpClient,Injectable
     ]
 })
 export class PagePsysurveyComponent  implements OnInit {
+  surveys: any[] = []; // 存储问卷通知
+  filteredSurveys: any[] = []; // 存储过滤后的问卷
+  userApartment: string = '' ; // 当前用户的学院
 
-  constructor(private router: Router) { }
+  constructor(private router: Router,private http: HttpClient,private userService: UserService) { }
   goTab1(){
     this.router.navigate(['tabs/tab1']);
    }
    goPublishSurvey(){
     this.router.navigate(['tabs/page-publishsurvey'])
    }
-  ngOnInit() {}
 
+   ngOnInit() {
+    // 动态获取当前用户的学院信息
+    this.userService.getCurrentUser().subscribe(user => {
+      this.userApartment = user.apartment; // 从用户数据中获取学院
+      this.getSurveys(); // 在获取到用户信息后获取问卷
+    }, error => {
+      console.error('获取用户信息时出错:', error);
+      // 可以设置一个默认值或处理错误
+    });
+  }
+
+  getSurveys() {
+    this.http.get('http://127.0.0.1:4040/apps/DevServer/browser/survey').subscribe(
+      (response: any) => {
+        this.surveys = response; // 假设响应是问卷数组
+        this.filterSurveys(); // 过滤问卷
+      },
+      error => {
+        console.error('获取问卷时出错:', error);
+      }
+    );
+  }
+  filterSurveys() {
+    this.filteredSurveys = this.surveys.filter(survey => {
+      return survey.audience === this.userApartment || survey.audience === 'all';
+    });
+  }
+  
+  
 }

soul-app/src/app/page-publishsurvey/page-publishsurvey.component.html

@@ -38,7 +38,7 @@
       <ion-label>面向对象</ion-label>
       <ion-select [(ngModel)]="targetAudience">
         <ion-select-option value="all">全校学生</ion-select-option>
-        <ion-select-option value="software">软件学院</ion-select-option>
+        <ion-select-option value="软件学院">软件学院</ion-select-option>
         <ion-select-option value="music">音乐学院</ion-select-option>
       </ion-select>
     </ion-item>

soul-app/src/app/page-publishsurvey/page-publishsurvey.component.ts

@@ -1,9 +1,11 @@
-import { Component, OnInit,NgModule } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { IonHeader,IonButton, IonContent, IonIcon, IonItem, IonLabel, IonList, 
   IonListHeader,IonCardHeader,IonCardTitle,IonCardContent, IonTitle,IonCard, IonToolbar,IonInput,IonSearchbar, IonSegment, IonSegmentButton, IonSelect, IonSelectOption } from '@ionic/angular/standalone';
   import { CommonModule } from '@angular/common';
   import { FormsModule } from '@angular/forms';
+  import { HttpClient } from '@angular/common/http';
+
 
 @Component({
   selector: 'app-page-publishsurvey',
@@ -11,9 +13,8 @@ import { IonHeader,IonButton, IonContent, IonIcon, IonItem, IonLabel, IonList,
   styleUrls: ['./page-publishsurvey.component.scss'],
   standalone: true,
   imports: [
-
     IonHeader,IonToolbar,IonTitle,IonContent,IonSegment,IonSegmentButton,IonSelect,IonSelectOption,
-    IonList,IonListHeader,IonItem,IonCardTitle,
+    IonList,IonListHeader,IonItem,IonCardTitle,HttpClient,
     IonLabel,IonIcon,IonButton,IonCardContent,
     IonInput,IonSearchbar,IonCard,IonCardHeader,
     CommonModule,FormsModule
@@ -26,8 +27,8 @@ export class PagePublishsurveyComponent  implements OnInit {
   surveyTitle: string = '';
   surveyLink: string = '';
   targetAudience: string = 'all'; // 默认面向对象
-  societySurveyTitle: string = '';
-  societySurveyLink: string = '';
+  // societySurveyTitle: string = '';
+  // societySurveyLink: string = '';
 
   onCategoryChange() {
     console.log(`当前选择的类别: ${this.category}`);
@@ -39,16 +40,32 @@ export class PagePublishsurveyComponent  implements OnInit {
     console.log(`链接: ${this.surveyLink}`);
     console.log(`面向对象: ${this.targetAudience}`);
     // 这里可以添加逻辑将问卷发布到后端或其他处理
+    const surveyData = {
+      title: this.surveyTitle,
+      link: this.surveyLink,
+      audience: this.targetAudience,
+    };
+
+    this.http.post('http://127.0.0.1:4040/apps/DevServer/browser/survey', surveyData).subscribe(
+      response => {
+        console.log('问卷已成功发布:', response);
+        // 发布成功后可以导航到心理普查页面
+        this.router.navigate(['tabs/psysurvey']);
+      },
+      error => {
+        console.error('发布问卷时出错:', error);
+      }
+    );
   }
 
-  publishSocietySurvey() {
-    console.log('发布社会问卷:');
-    console.log(`标题: ${this.societySurveyTitle}`);
-    console.log(`链接: ${this.societySurveyLink}`);
+  // publishSocietySurvey() {
+  //   console.log('发布社会问卷:');
+  //   console.log(`标题: ${this.societySurveyTitle}`);
+  //   console.log(`链接: ${this.societySurveyLink}`);
     // 这里可以添加逻辑将问卷发布到后端或其他处理
-  }
+  // }
 
-  constructor(private router: Router) { }
+  constructor(private router: Router,private http: HttpClient) { }
   goTab1(){
     this.router.navigate(['tabs/tab1']);
    }

soul-app/src/app/user.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { UserService } from './user.service';
+
+describe('UserService', () => {
+  let service: UserService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(UserService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

soul-app/src/app/user.service.ts

@@ -0,0 +1,17 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class UserService {
+  private apiUrl = 'http://127.0.0.1:4040/apps/DevServer/browser/survey'; // 替换为你的 API URL
+
+  constructor(private http: HttpClient) {}
+
+  // 获取当前用户信息
+  getCurrentUser(): Observable<any> {
+    return this.http.get(`${this.apiUrl}/current-user`); // 假设这个 API 返回当前用户的信息
+  }
+}