diff --git a/backend/pom.xml b/backend/pom.xml index b9a410f..634ffd1 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -1,4 +1,4 @@ - 4.0.0 @@ -65,6 +65,17 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + -parameters + + + org.springframework.boot spring-boot-maven-plugin diff --git a/backend/sql/schema.sql b/backend/sql/schema.sql index 4733fd8..bb9d405 100644 --- a/backend/sql/schema.sql +++ b/backend/sql/schema.sql @@ -1,4 +1,4 @@ -CREATE DATABASE IF NOT EXISTS nursing_home DEFAULT CHARACTER SET utf8mb4; +CREATE DATABASE IF NOT EXISTS nursing_home DEFAULT CHARACTER SET utf8mb4; USE nursing_home; DROP TABLE IF EXISTS payment_record; @@ -141,3 +141,60 @@ CREATE TABLE payment_record ( INSERT INTO sys_user(username, password, name, phone, role, status) VALUES ('admin', 'admin123', 'Administrator', '13800000000', 'ADMIN', 1); + +INSERT INTO sys_user(username, password, name, phone, role, status) +VALUES +('nurse1', 'nurse123', '护工刘敏', '13800000001', 'NURSE', 1), +('nurse2', 'nurse123', '护工张凯', '13800000002', 'NURSE', 1), +('family1', 'family123', '家属王伟', '13800000003', 'FAMILY', 1); + +INSERT INTO elder(name, gender, id_card, birthday, room_no, check_in_date, care_level, status, remark) +VALUES +('陈国强', 'M', '110101194001010011', '1940-01-01', 'A101', '2023-01-10', '一级', '在住', '糖尿病史'), +('李秀兰', 'F', '110101194502020022', '1945-02-02', 'A102', '2023-02-15', '二级', '在住', '需要日常护理'), +('王德华', 'M', '110101195003030033', '1950-03-03', 'B201', '2023-03-20', '一级', '在住', '身体状况良好'); + +INSERT INTO family_elder(family_id, elder_id, relationship) +VALUES +(3, 1, '儿子'), +(3, 2, '女儿'); + +INSERT INTO schedule(nurse_id, date, shift, task) +VALUES +(2, '2024-06-01', '早班', 'A区日常巡查'), +(2, '2024-06-02', '夜班', 'A区夜间护理'), +(3, '2024-06-01', '中班', 'B区护理支持'); + +INSERT INTO care_record(elder_id, nurse_id, content, attachment_url, record_time) +VALUES +(1, 2, '协助用餐与日常清洁', NULL, '2024-06-01 09:30:00'), +(2, 3, '协助进行下肢活动训练', NULL, '2024-06-01 14:10:00'); + +INSERT INTO health_record(elder_id, nurse_id, temperature, bp_systolic, bp_diastolic, heart_rate, note, record_time) +VALUES +(1, 2, 36.6, 120, 80, 72, '正常', '2024-06-01 09:45:00'), +(2, 3, 36.8, 130, 85, 78, '血压略高', '2024-06-01 14:20:00'); + +INSERT INTO handover(nurse_id, date, content) +VALUES +(2, '2024-06-01', 'A区平稳，晚餐后关注陈国强'), +(3, '2024-06-01', 'B区训练完成，无异常情况'); + +INSERT INTO notice(title, content, target_role, target_user_id, created_by) +VALUES +('培训通知', '本周五10点进行消防演练培训', 'NURSE', NULL, 1), +('探视时间', '探视时间更新为 14:00-17:00', 'FAMILY', NULL, 1), +('全员会议', '周一上午召开月度会议', 'ALL', NULL, 1); + +INSERT INTO feedback(family_id, elder_id, type, content, rating, status) +VALUES +(3, 1, 'SUGGESTION', '建议餐食增加蔬菜比例', 4, 'NEW'); + +INSERT INTO bill(elder_id, month, bed_fee, care_fee, meal_fee, other_fee, total, status) +VALUES +(1, '2024-05', 2000.00, 1500.00, 800.00, 0.00, 4300.00, 'UNPAID'), +(2, '2024-05', 2000.00, 1800.00, 800.00, 100.00, 4700.00, 'PAID'); + +INSERT INTO payment_record(bill_id, family_id, amount, method, paid_at) +VALUES +(2, 3, 4700.00, 'ONLINE', '2024-05-28 10:00:00'); diff --git a/backend/src/main/java/com/nursinghome/NursingHomeApplication.java b/backend/src/main/java/com/nursinghome/NursingHomeApplication.java index b1445ed..b52f70d 100644 --- a/backend/src/main/java/com/nursinghome/NursingHomeApplication.java +++ b/backend/src/main/java/com/nursinghome/NursingHomeApplication.java @@ -1,4 +1,4 @@ -package com.nursinghome; +package com.nursinghome; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; diff --git a/backend/src/main/java/com/nursinghome/common/ApiException.java b/backend/src/main/java/com/nursinghome/common/ApiException.java index f3dfa4d..f987eba 100644 --- a/backend/src/main/java/com/nursinghome/common/ApiException.java +++ b/backend/src/main/java/com/nursinghome/common/ApiException.java @@ -1,4 +1,4 @@ -package com.nursinghome.common; +package com.nursinghome.common; public class ApiException extends RuntimeException { public ApiException(String message) { diff --git a/backend/src/main/java/com/nursinghome/common/ApiResponse.java b/backend/src/main/java/com/nursinghome/common/ApiResponse.java index d079e36..fab2760 100644 --- a/backend/src/main/java/com/nursinghome/common/ApiResponse.java +++ b/backend/src/main/java/com/nursinghome/common/ApiResponse.java @@ -1,4 +1,4 @@ -package com.nursinghome.common; +package com.nursinghome.common; public class ApiResponse { private int code; diff --git a/backend/src/main/java/com/nursinghome/common/GlobalExceptionHandler.java b/backend/src/main/java/com/nursinghome/common/GlobalExceptionHandler.java index 1f4b041..4c7f572 100644 --- a/backend/src/main/java/com/nursinghome/common/GlobalExceptionHandler.java +++ b/backend/src/main/java/com/nursinghome/common/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.nursinghome.common; +package com.nursinghome.common; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/backend/src/main/java/com/nursinghome/config/CorsConfig.java b/backend/src/main/java/com/nursinghome/config/CorsConfig.java index 5942b33..3f618b2 100644 --- a/backend/src/main/java/com/nursinghome/config/CorsConfig.java +++ b/backend/src/main/java/com/nursinghome/config/CorsConfig.java @@ -1,4 +1,4 @@ -package com.nursinghome.config; +package com.nursinghome.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; diff --git a/backend/src/main/java/com/nursinghome/config/SaTokenStpInterfaceImpl.java b/backend/src/main/java/com/nursinghome/config/SaTokenStpInterfaceImpl.java index e5446e6..d0fc04c 100644 --- a/backend/src/main/java/com/nursinghome/config/SaTokenStpInterfaceImpl.java +++ b/backend/src/main/java/com/nursinghome/config/SaTokenStpInterfaceImpl.java @@ -1,4 +1,4 @@ -package com.nursinghome.config; +package com.nursinghome.config; import cn.dev33.satoken.stp.StpInterface; import com.nursinghome.entity.User; diff --git a/backend/src/main/java/com/nursinghome/config/WebConfig.java b/backend/src/main/java/com/nursinghome/config/WebConfig.java index ba7318d..f3571bd 100644 --- a/backend/src/main/java/com/nursinghome/config/WebConfig.java +++ b/backend/src/main/java/com/nursinghome/config/WebConfig.java @@ -1,4 +1,4 @@ -package com.nursinghome.config; +package com.nursinghome.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/backend/src/main/java/com/nursinghome/controller/AdminController.java b/backend/src/main/java/com/nursinghome/controller/AdminController.java index 53c090a..67f028e 100644 --- a/backend/src/main/java/com/nursinghome/controller/AdminController.java +++ b/backend/src/main/java/com/nursinghome/controller/AdminController.java @@ -1,4 +1,4 @@ -package com.nursinghome.controller; +package com.nursinghome.controller; import cn.dev33.satoken.annotation.SaCheckRole; import cn.dev33.satoken.stp.StpUtil; diff --git a/backend/src/main/java/com/nursinghome/controller/AuthController.java b/backend/src/main/java/com/nursinghome/controller/AuthController.java index 06b307a..aa3adf3 100644 --- a/backend/src/main/java/com/nursinghome/controller/AuthController.java +++ b/backend/src/main/java/com/nursinghome/controller/AuthController.java @@ -1,4 +1,4 @@ -package com.nursinghome.controller; +package com.nursinghome.controller; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.stp.StpUtil; diff --git a/backend/src/main/java/com/nursinghome/controller/FamilyController.java b/backend/src/main/java/com/nursinghome/controller/FamilyController.java index 8bcc725..9ed7106 100644 --- a/backend/src/main/java/com/nursinghome/controller/FamilyController.java +++ b/backend/src/main/java/com/nursinghome/controller/FamilyController.java @@ -1,4 +1,4 @@ -package com.nursinghome.controller; +package com.nursinghome.controller; import cn.dev33.satoken.annotation.SaCheckRole; import cn.dev33.satoken.stp.StpUtil; diff --git a/backend/src/main/java/com/nursinghome/controller/FileController.java b/backend/src/main/java/com/nursinghome/controller/FileController.java index ca48153..c6d9889 100644 --- a/backend/src/main/java/com/nursinghome/controller/FileController.java +++ b/backend/src/main/java/com/nursinghome/controller/FileController.java @@ -1,4 +1,4 @@ -package com.nursinghome.controller; +package com.nursinghome.controller; import com.nursinghome.common.ApiResponse; import org.springframework.beans.factory.annotation.Value; diff --git a/backend/src/main/java/com/nursinghome/controller/NurseController.java b/backend/src/main/java/com/nursinghome/controller/NurseController.java index a8c4d35..2f0cb53 100644 --- a/backend/src/main/java/com/nursinghome/controller/NurseController.java +++ b/backend/src/main/java/com/nursinghome/controller/NurseController.java @@ -1,4 +1,4 @@ -package com.nursinghome.controller; +package com.nursinghome.controller; import cn.dev33.satoken.annotation.SaCheckRole; import cn.dev33.satoken.stp.StpUtil; diff --git a/backend/src/main/java/com/nursinghome/dto/BillRequest.java b/backend/src/main/java/com/nursinghome/dto/BillRequest.java index ec05fa5..6e2855e 100644 --- a/backend/src/main/java/com/nursinghome/dto/BillRequest.java +++ b/backend/src/main/java/com/nursinghome/dto/BillRequest.java @@ -1,4 +1,4 @@ -package com.nursinghome.dto; +package com.nursinghome.dto; import java.math.BigDecimal; diff --git a/backend/src/main/java/com/nursinghome/dto/CareRecordRequest.java b/backend/src/main/java/com/nursinghome/dto/CareRecordRequest.java index fe3a3c8..7ac2eac 100644 --- a/backend/src/main/java/com/nursinghome/dto/CareRecordRequest.java +++ b/backend/src/main/java/com/nursinghome/dto/CareRecordRequest.java @@ -1,4 +1,4 @@ -package com.nursinghome.dto; +package com.nursinghome.dto; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/nursinghome/dto/ElderRequest.java b/backend/src/main/java/com/nursinghome/dto/ElderRequest.java index a04ee47..aed23a8 100644 --- a/backend/src/main/java/com/nursinghome/dto/ElderRequest.java +++ b/backend/src/main/java/com/nursinghome/dto/ElderRequest.java @@ -1,4 +1,4 @@ -package com.nursinghome.dto; +package com.nursinghome.dto; import java.time.LocalDate; diff --git a/backend/src/main/java/com/nursinghome/dto/FeedbackRequest.java b/backend/src/main/java/com/nursinghome/dto/FeedbackRequest.java index 2d29e29..e61ce33 100644 --- a/backend/src/main/java/com/nursinghome/dto/FeedbackRequest.java +++ b/backend/src/main/java/com/nursinghome/dto/FeedbackRequest.java @@ -1,4 +1,4 @@ -package com.nursinghome.dto; +package com.nursinghome.dto; public class FeedbackRequest { private Long elderId; diff --git a/backend/src/main/java/com/nursinghome/dto/FeedbackUpdateRequest.java b/backend/src/main/java/com/nursinghome/dto/FeedbackUpdateRequest.java index 89861b9..928f0f6 100644 --- a/backend/src/main/java/com/nursinghome/dto/FeedbackUpdateRequest.java +++ b/backend/src/main/java/com/nursinghome/dto/FeedbackUpdateRequest.java @@ -1,4 +1,4 @@ -package com.nursinghome.dto; +package com.nursinghome.dto; public class FeedbackUpdateRequest { private Long id; diff --git a/backend/src/main/java/com/nursinghome/dto/HandoverRequest.java b/backend/src/main/java/com/nursinghome/dto/HandoverRequest.java index 45e416a..0421523 100644 --- a/backend/src/main/java/com/nursinghome/dto/HandoverRequest.java +++ b/backend/src/main/java/com/nursinghome/dto/HandoverRequest.java @@ -1,4 +1,4 @@ -package com.nursinghome.dto; +package com.nursinghome.dto; import java.time.LocalDate; diff --git a/backend/src/main/java/com/nursinghome/dto/HealthRecordRequest.java b/backend/src/main/java/com/nursinghome/dto/HealthRecordRequest.java index d642948..5d0b795 100644 --- a/backend/src/main/java/com/nursinghome/dto/HealthRecordRequest.java +++ b/backend/src/main/java/com/nursinghome/dto/HealthRecordRequest.java @@ -1,4 +1,4 @@ -package com.nursinghome.dto; +package com.nursinghome.dto; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/nursinghome/dto/LoginRequest.java b/backend/src/main/java/com/nursinghome/dto/LoginRequest.java index 694df6d..5d7f421 100644 --- a/backend/src/main/java/com/nursinghome/dto/LoginRequest.java +++ b/backend/src/main/java/com/nursinghome/dto/LoginRequest.java @@ -1,4 +1,4 @@ -package com.nursinghome.dto; +package com.nursinghome.dto; import jakarta.validation.constraints.NotBlank; diff --git a/backend/src/main/java/com/nursinghome/dto/NoticeRequest.java b/backend/src/main/java/com/nursinghome/dto/NoticeRequest.java index b4fa26f..13a2e13 100644 --- a/backend/src/main/java/com/nursinghome/dto/NoticeRequest.java +++ b/backend/src/main/java/com/nursinghome/dto/NoticeRequest.java @@ -1,4 +1,4 @@ -package com.nursinghome.dto; +package com.nursinghome.dto; public class NoticeRequest { private String title; diff --git a/backend/src/main/java/com/nursinghome/dto/PayRequest.java b/backend/src/main/java/com/nursinghome/dto/PayRequest.java index 08f2b90..b1d9289 100644 --- a/backend/src/main/java/com/nursinghome/dto/PayRequest.java +++ b/backend/src/main/java/com/nursinghome/dto/PayRequest.java @@ -1,4 +1,4 @@ -package com.nursinghome.dto; +package com.nursinghome.dto; public class PayRequest { private String method; diff --git a/backend/src/main/java/com/nursinghome/dto/RegisterRequest.java b/backend/src/main/java/com/nursinghome/dto/RegisterRequest.java index fa48de2..93cbd42 100644 --- a/backend/src/main/java/com/nursinghome/dto/RegisterRequest.java +++ b/backend/src/main/java/com/nursinghome/dto/RegisterRequest.java @@ -1,4 +1,4 @@ -package com.nursinghome.dto; +package com.nursinghome.dto; import jakarta.validation.constraints.NotBlank; diff --git a/backend/src/main/java/com/nursinghome/dto/ScheduleRequest.java b/backend/src/main/java/com/nursinghome/dto/ScheduleRequest.java index 74a38c0..e3398b7 100644 --- a/backend/src/main/java/com/nursinghome/dto/ScheduleRequest.java +++ b/backend/src/main/java/com/nursinghome/dto/ScheduleRequest.java @@ -1,4 +1,4 @@ -package com.nursinghome.dto; +package com.nursinghome.dto; import java.time.LocalDate; diff --git a/backend/src/main/java/com/nursinghome/dto/UserRequest.java b/backend/src/main/java/com/nursinghome/dto/UserRequest.java index 0ff9ef2..eb47980 100644 --- a/backend/src/main/java/com/nursinghome/dto/UserRequest.java +++ b/backend/src/main/java/com/nursinghome/dto/UserRequest.java @@ -1,4 +1,4 @@ -package com.nursinghome.dto; +package com.nursinghome.dto; public class UserRequest { private String username; diff --git a/backend/src/main/java/com/nursinghome/dto/UserUpdateRequest.java b/backend/src/main/java/com/nursinghome/dto/UserUpdateRequest.java index 8bfc363..eacfc3f 100644 --- a/backend/src/main/java/com/nursinghome/dto/UserUpdateRequest.java +++ b/backend/src/main/java/com/nursinghome/dto/UserUpdateRequest.java @@ -1,4 +1,4 @@ -package com.nursinghome.dto; +package com.nursinghome.dto; public class UserUpdateRequest { private Long id; diff --git a/backend/src/main/java/com/nursinghome/entity/Bill.java b/backend/src/main/java/com/nursinghome/entity/Bill.java index bac592b..d93f7e0 100644 --- a/backend/src/main/java/com/nursinghome/entity/Bill.java +++ b/backend/src/main/java/com/nursinghome/entity/Bill.java @@ -1,4 +1,4 @@ -package com.nursinghome.entity; +package com.nursinghome.entity; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/nursinghome/entity/CareRecord.java b/backend/src/main/java/com/nursinghome/entity/CareRecord.java index 4336772..547a9e4 100644 --- a/backend/src/main/java/com/nursinghome/entity/CareRecord.java +++ b/backend/src/main/java/com/nursinghome/entity/CareRecord.java @@ -1,4 +1,4 @@ -package com.nursinghome.entity; +package com.nursinghome.entity; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/nursinghome/entity/Elder.java b/backend/src/main/java/com/nursinghome/entity/Elder.java index 537d704..238c2ff 100644 --- a/backend/src/main/java/com/nursinghome/entity/Elder.java +++ b/backend/src/main/java/com/nursinghome/entity/Elder.java @@ -1,4 +1,4 @@ -package com.nursinghome.entity; +package com.nursinghome.entity; import java.time.LocalDate; diff --git a/backend/src/main/java/com/nursinghome/entity/FamilyElder.java b/backend/src/main/java/com/nursinghome/entity/FamilyElder.java index f76f8d1..77426f5 100644 --- a/backend/src/main/java/com/nursinghome/entity/FamilyElder.java +++ b/backend/src/main/java/com/nursinghome/entity/FamilyElder.java @@ -1,4 +1,4 @@ -package com.nursinghome.entity; +package com.nursinghome.entity; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/nursinghome/entity/Feedback.java b/backend/src/main/java/com/nursinghome/entity/Feedback.java index a860343..d0ef9b3 100644 --- a/backend/src/main/java/com/nursinghome/entity/Feedback.java +++ b/backend/src/main/java/com/nursinghome/entity/Feedback.java @@ -1,4 +1,4 @@ -package com.nursinghome.entity; +package com.nursinghome.entity; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/nursinghome/entity/Handover.java b/backend/src/main/java/com/nursinghome/entity/Handover.java index 6a36933..6df02fe 100644 --- a/backend/src/main/java/com/nursinghome/entity/Handover.java +++ b/backend/src/main/java/com/nursinghome/entity/Handover.java @@ -1,4 +1,4 @@ -package com.nursinghome.entity; +package com.nursinghome.entity; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/nursinghome/entity/HealthRecord.java b/backend/src/main/java/com/nursinghome/entity/HealthRecord.java index 32aa0b8..946afcd 100644 --- a/backend/src/main/java/com/nursinghome/entity/HealthRecord.java +++ b/backend/src/main/java/com/nursinghome/entity/HealthRecord.java @@ -1,4 +1,4 @@ -package com.nursinghome.entity; +package com.nursinghome.entity; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/nursinghome/entity/Notice.java b/backend/src/main/java/com/nursinghome/entity/Notice.java index fac03fa..8c34f93 100644 --- a/backend/src/main/java/com/nursinghome/entity/Notice.java +++ b/backend/src/main/java/com/nursinghome/entity/Notice.java @@ -1,4 +1,4 @@ -package com.nursinghome.entity; +package com.nursinghome.entity; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/nursinghome/entity/PaymentRecord.java b/backend/src/main/java/com/nursinghome/entity/PaymentRecord.java index 37e6783..3b032be 100644 --- a/backend/src/main/java/com/nursinghome/entity/PaymentRecord.java +++ b/backend/src/main/java/com/nursinghome/entity/PaymentRecord.java @@ -1,4 +1,4 @@ -package com.nursinghome.entity; +package com.nursinghome.entity; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/nursinghome/entity/Schedule.java b/backend/src/main/java/com/nursinghome/entity/Schedule.java index 51a3a69..d9c1f36 100644 --- a/backend/src/main/java/com/nursinghome/entity/Schedule.java +++ b/backend/src/main/java/com/nursinghome/entity/Schedule.java @@ -1,4 +1,4 @@ -package com.nursinghome.entity; +package com.nursinghome.entity; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/nursinghome/entity/User.java b/backend/src/main/java/com/nursinghome/entity/User.java index 9baacac..8ab5d04 100644 --- a/backend/src/main/java/com/nursinghome/entity/User.java +++ b/backend/src/main/java/com/nursinghome/entity/User.java @@ -1,4 +1,4 @@ -package com.nursinghome.entity; +package com.nursinghome.entity; import java.time.LocalDateTime; diff --git a/backend/src/main/java/com/nursinghome/mapper/BillMapper.java b/backend/src/main/java/com/nursinghome/mapper/BillMapper.java index 044d248..7a1f250 100644 --- a/backend/src/main/java/com/nursinghome/mapper/BillMapper.java +++ b/backend/src/main/java/com/nursinghome/mapper/BillMapper.java @@ -1,4 +1,4 @@ -package com.nursinghome.mapper; +package com.nursinghome.mapper; import com.nursinghome.entity.Bill; import org.apache.ibatis.annotations.*; diff --git a/backend/src/main/java/com/nursinghome/mapper/CareRecordMapper.java b/backend/src/main/java/com/nursinghome/mapper/CareRecordMapper.java index 7719a39..8407ff4 100644 --- a/backend/src/main/java/com/nursinghome/mapper/CareRecordMapper.java +++ b/backend/src/main/java/com/nursinghome/mapper/CareRecordMapper.java @@ -1,4 +1,4 @@ -package com.nursinghome.mapper; +package com.nursinghome.mapper; import com.nursinghome.entity.CareRecord; import org.apache.ibatis.annotations.*; diff --git a/backend/src/main/java/com/nursinghome/mapper/ElderMapper.java b/backend/src/main/java/com/nursinghome/mapper/ElderMapper.java index 475c226..41dd5a5 100644 --- a/backend/src/main/java/com/nursinghome/mapper/ElderMapper.java +++ b/backend/src/main/java/com/nursinghome/mapper/ElderMapper.java @@ -1,4 +1,4 @@ -package com.nursinghome.mapper; +package com.nursinghome.mapper; import com.nursinghome.entity.Elder; import org.apache.ibatis.annotations.*; diff --git a/backend/src/main/java/com/nursinghome/mapper/FamilyElderMapper.java b/backend/src/main/java/com/nursinghome/mapper/FamilyElderMapper.java index 52670ba..18bd140 100644 --- a/backend/src/main/java/com/nursinghome/mapper/FamilyElderMapper.java +++ b/backend/src/main/java/com/nursinghome/mapper/FamilyElderMapper.java @@ -1,4 +1,4 @@ -package com.nursinghome.mapper; +package com.nursinghome.mapper; import com.nursinghome.entity.FamilyElder; import org.apache.ibatis.annotations.*; diff --git a/backend/src/main/java/com/nursinghome/mapper/FeedbackMapper.java b/backend/src/main/java/com/nursinghome/mapper/FeedbackMapper.java index 0e197c3..bad63e5 100644 --- a/backend/src/main/java/com/nursinghome/mapper/FeedbackMapper.java +++ b/backend/src/main/java/com/nursinghome/mapper/FeedbackMapper.java @@ -1,4 +1,4 @@ -package com.nursinghome.mapper; +package com.nursinghome.mapper; import com.nursinghome.entity.Feedback; import org.apache.ibatis.annotations.*; diff --git a/backend/src/main/java/com/nursinghome/mapper/HandoverMapper.java b/backend/src/main/java/com/nursinghome/mapper/HandoverMapper.java index 59f530f..42aace9 100644 --- a/backend/src/main/java/com/nursinghome/mapper/HandoverMapper.java +++ b/backend/src/main/java/com/nursinghome/mapper/HandoverMapper.java @@ -1,4 +1,4 @@ -package com.nursinghome.mapper; +package com.nursinghome.mapper; import com.nursinghome.entity.Handover; import org.apache.ibatis.annotations.*; diff --git a/backend/src/main/java/com/nursinghome/mapper/HealthRecordMapper.java b/backend/src/main/java/com/nursinghome/mapper/HealthRecordMapper.java index 688d0a6..977f280 100644 --- a/backend/src/main/java/com/nursinghome/mapper/HealthRecordMapper.java +++ b/backend/src/main/java/com/nursinghome/mapper/HealthRecordMapper.java @@ -1,4 +1,4 @@ -package com.nursinghome.mapper; +package com.nursinghome.mapper; import com.nursinghome.entity.HealthRecord; import org.apache.ibatis.annotations.*; diff --git a/backend/src/main/java/com/nursinghome/mapper/NoticeMapper.java b/backend/src/main/java/com/nursinghome/mapper/NoticeMapper.java index d850d09..e15f7ad 100644 --- a/backend/src/main/java/com/nursinghome/mapper/NoticeMapper.java +++ b/backend/src/main/java/com/nursinghome/mapper/NoticeMapper.java @@ -1,4 +1,4 @@ -package com.nursinghome.mapper; +package com.nursinghome.mapper; import com.nursinghome.entity.Notice; import org.apache.ibatis.annotations.*; diff --git a/backend/src/main/java/com/nursinghome/mapper/PaymentRecordMapper.java b/backend/src/main/java/com/nursinghome/mapper/PaymentRecordMapper.java index 6731892..8deedad 100644 --- a/backend/src/main/java/com/nursinghome/mapper/PaymentRecordMapper.java +++ b/backend/src/main/java/com/nursinghome/mapper/PaymentRecordMapper.java @@ -1,4 +1,4 @@ -package com.nursinghome.mapper; +package com.nursinghome.mapper; import com.nursinghome.entity.PaymentRecord; import org.apache.ibatis.annotations.*; diff --git a/backend/src/main/java/com/nursinghome/mapper/ScheduleMapper.java b/backend/src/main/java/com/nursinghome/mapper/ScheduleMapper.java index 0f7b5b3..2b75226 100644 --- a/backend/src/main/java/com/nursinghome/mapper/ScheduleMapper.java +++ b/backend/src/main/java/com/nursinghome/mapper/ScheduleMapper.java @@ -1,4 +1,4 @@ -package com.nursinghome.mapper; +package com.nursinghome.mapper; import com.nursinghome.entity.Schedule; import org.apache.ibatis.annotations.*; diff --git a/backend/src/main/java/com/nursinghome/mapper/UserMapper.java b/backend/src/main/java/com/nursinghome/mapper/UserMapper.java index e3787db..16d9a95 100644 --- a/backend/src/main/java/com/nursinghome/mapper/UserMapper.java +++ b/backend/src/main/java/com/nursinghome/mapper/UserMapper.java @@ -1,4 +1,4 @@ -package com.nursinghome.mapper; +package com.nursinghome.mapper; import com.nursinghome.entity.User; import org.apache.ibatis.annotations.*; diff --git a/backend/src/main/java/com/nursinghome/service/BillService.java b/backend/src/main/java/com/nursinghome/service/BillService.java index b20ba6d..92890b5 100644 --- a/backend/src/main/java/com/nursinghome/service/BillService.java +++ b/backend/src/main/java/com/nursinghome/service/BillService.java @@ -1,4 +1,4 @@ -package com.nursinghome.service; +package com.nursinghome.service; import com.nursinghome.entity.Bill; import com.nursinghome.entity.PaymentRecord; diff --git a/backend/src/main/java/com/nursinghome/service/ElderService.java b/backend/src/main/java/com/nursinghome/service/ElderService.java index e2ec540..52987a7 100644 --- a/backend/src/main/java/com/nursinghome/service/ElderService.java +++ b/backend/src/main/java/com/nursinghome/service/ElderService.java @@ -1,4 +1,4 @@ -package com.nursinghome.service; +package com.nursinghome.service; import com.nursinghome.common.ApiException; import com.nursinghome.entity.Elder; diff --git a/backend/src/main/java/com/nursinghome/service/FamilyService.java b/backend/src/main/java/com/nursinghome/service/FamilyService.java index 23a004c..11626af 100644 --- a/backend/src/main/java/com/nursinghome/service/FamilyService.java +++ b/backend/src/main/java/com/nursinghome/service/FamilyService.java @@ -1,4 +1,4 @@ -package com.nursinghome.service; +package com.nursinghome.service; import com.nursinghome.common.ApiException; import com.nursinghome.entity.Elder; diff --git a/backend/src/main/java/com/nursinghome/service/UserService.java b/backend/src/main/java/com/nursinghome/service/UserService.java index 50e48d8..8a3ae06 100644 --- a/backend/src/main/java/com/nursinghome/service/UserService.java +++ b/backend/src/main/java/com/nursinghome/service/UserService.java @@ -1,4 +1,4 @@ -package com.nursinghome.service; +package com.nursinghome.service; import com.nursinghome.common.ApiException; import com.nursinghome.entity.User; diff --git a/backend/src/main/java/com/nursinghome/util/PasswordUtil.java b/backend/src/main/java/com/nursinghome/util/PasswordUtil.java index 8f00634..32dd4a4 100644 --- a/backend/src/main/java/com/nursinghome/util/PasswordUtil.java +++ b/backend/src/main/java/com/nursinghome/util/PasswordUtil.java @@ -1,4 +1,4 @@ -package com.nursinghome.util; +package com.nursinghome.util; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index 28d6dea..058b361 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -1,11 +1,11 @@ -server: +server: port: 8080 spring: datasource: - url: jdbc:mysql://localhost:3306/nursing_home?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai + url: jdbc:mysql://localhost:3307/nursing_home?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai username: root - password: root + password: qq5211314 driver-class-name: com.mysql.cj.jdbc.Driver servlet: multipart: @@ -23,6 +23,7 @@ sa-token: is-concurrent: true is-share: true token-style: uuid + active-timeout: -1 app: upload-dir: uploads diff --git a/frontend/package.json b/frontend/package.json index 9fd2a10..65afbc3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,4 +1,4 @@ -{ +{ "name": "nursing-home-frontend", "version": "1.0.0", "private": true, @@ -8,6 +8,7 @@ }, "dependencies": { "axios": "^1.6.8", + "core-js": "^3.36.0", "element-ui": "^2.15.14", "vue": "^2.7.16", "vue-router": "^3.6.5" @@ -15,8 +16,12 @@ "devDependencies": { "@vue/cli-plugin-babel": "^5.0.8", "@vue/cli-service": "^5.0.8", + "@babel/preset-env": "7.23.9", "babel-core": "^7.0.0-bridge.0", "babel-loader": "^8.3.0", "vue-template-compiler": "^2.7.16" + }, + "overrides": { + "@babel/preset-env": "7.23.9" } } diff --git a/frontend/public/index.html b/frontend/public/index.html index 9c8ef07..bd4f791 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -3,7 +3,7 @@ - Nursing Home + 颐云养老院管理平台