修复了totalnum显示错误的问题

# Conflicts:
#	src/main/java/org/cmh/backend/authentication/repository/UserRepository.java
#	src/main/java/org/cmh/backend/authentication/service/UserService.java

pom.xml

@@ -93,11 +93,6 @@
 			<scope>runtime</scope>
 			<optional>true</optional>
 		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>com.h2database</groupId>-->
-<!--			<artifactId>h2</artifactId>-->
-<!--			<scope>runtime</scope>-->
-<!--		</dependency>-->
 		<dependency>
 			<groupId>com.mysql</groupId>
 			<artifactId>mysql-connector-j</artifactId>
@@ -128,6 +123,12 @@
 			<artifactId>spring-boot-testcontainers</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>
 			<artifactId>mybatis-spring-boot-starter-test</artifactId>
@@ -164,6 +165,17 @@
 			<artifactId>mysql</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>5.2.3</version> <!-- 请使用最新版本 -->
+		</dependency><!-- BY JERRY -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>4.0.1</version> <!-- 请使用最新版本 -->
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/org/cmh/backend/Config/SecurityConfig.java

@@ -4,6 +4,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
 
 @Configuration
@@ -11,13 +13,22 @@ public class SecurityConfig {
 
     @Bean
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-        // Use the new API to disable CSRF
+        // Disable CSRF
         http.csrf(AbstractHttpConfigurer::disable)
-                // Permit all requests
+                // Permit all requests to all endpoints
                 .authorizeHttpRequests(authorize -> authorize
-                        .anyRequest().permitAll()
+                        .anyRequest().permitAll() // Allow all requests without authentication
-                );
+                )
+                // Disable form login
+                .formLogin(AbstractHttpConfigurer::disable)
+                // Disable logout
+                .logout(AbstractHttpConfigurer::disable);
 
         return http.build();
     }
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
 }

src/main/java/org/cmh/backend/CourseManagement/controller/CourseController.java

@@ -0,0 +1,138 @@
+package org.cmh.backend.CourseManagement.controller;
+
+import org.cmh.backend.CourseManagement.dto.GetCourseListResponse;
+import org.cmh.backend.CourseManagement.dto.MessageResponse;
+import org.cmh.backend.CourseManagement.dto.CourseRequest;
+import org.cmh.backend.CourseManagement.dto.SearchCourseRequest;
+import org.cmh.backend.CourseManagement.model.Course;
+import org.cmh.backend.CourseManagement.service.CourseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import jakarta.persistence.EntityNotFoundException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@RestController
+@RequestMapping("/courses")
+public class CourseController {
+
+    private static final Logger logger = LoggerFactory.getLogger(CourseController.class);
+
+    @Autowired
+    private CourseService courseService;
+
+    @GetMapping
+    public ResponseEntity<GetCourseListResponse> getCoursesByRange(@RequestParam Integer start, @RequestParam Integer end, @RequestParam String token) {
+        if (start >= end) {
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+        }
+        long courseCount = courseService.getCourseCount();
+        return new ResponseEntity<>(new GetCourseListResponse(courseCount, courseService.getCoursesByRange(start, end)), HttpStatus.OK);
+    }
+
+    @GetMapping("/{id}")
+    public ResponseEntity<Course> getCoursePage(@PathVariable Long id, @RequestParam String token) {
+        try {
+            return new ResponseEntity<>(courseService.getCourseById(id), HttpStatus.OK);
+        } catch (EntityNotFoundException e) {
+            logger.error("Course not found with id: {}", id, e);
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+    }
+
+    @PostMapping
+    public ResponseEntity<MessageResponse> createCourse(@RequestBody CourseRequest request) {
+        try {
+            courseService.createCourse(request);
+        } catch (DataIntegrityViolationException e) {
+            logger.error("Create course failed: Data integrity violation", e);
+            return new ResponseEntity<>(new MessageResponse("创建失败，课程已存在或缺少字段"), HttpStatus.BAD_REQUEST);
+        } catch (Exception e) {
+            logger.error("Create course failed: {}", e.getMessage(), e);
+            return new ResponseEntity<>(new MessageResponse("创建失败:" + e.getMessage()), HttpStatus.BAD_REQUEST);
+        }
+        return new ResponseEntity<>(new MessageResponse("创建成功"), HttpStatus.CREATED);
+    }
+
+    @PutMapping("/{id}")
+    public ResponseEntity<MessageResponse> updateCourse(@PathVariable Long id, @RequestBody CourseRequest request) {
+        try {
+            courseService.updateCourse(id, request);
+        } catch (DataIntegrityViolationException e) {
+            logger.error("Update course failed: Data integrity violation", e);
+            return new ResponseEntity<>(new MessageResponse("修改失败，新标题已存在或缺少字段"), HttpStatus.BAD_REQUEST);
+        } catch (EntityNotFoundException e) {
+            logger.error("Course not found with id: {}", id, e);
+            return new ResponseEntity<>(new MessageResponse("修改失败: 课程不存在"), HttpStatus.NOT_FOUND);
+        } catch (Exception e) {
+            logger.error("Update course failed: {}", e.getMessage(), e);
+            return new ResponseEntity<>(new MessageResponse("修改失败:" + e.getMessage()), HttpStatus.BAD_REQUEST);
+        }
+        return new ResponseEntity<>(new MessageResponse("修改成功"), HttpStatus.OK);
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<MessageResponse> deleteCourse(@PathVariable Long id, @RequestParam String token) {
+        try {
+            courseService.deleteCourse(id);
+        } catch (EntityNotFoundException e) {
+            logger.error("Course not found with id: {}", id, e);
+            return new ResponseEntity<>(new MessageResponse("删除失败，课程不存在"), HttpStatus.BAD_REQUEST);
+        } catch (Exception e) {
+            logger.error("Delete course failed: {}", e.getMessage(), e);
+            return new ResponseEntity<>(new MessageResponse("删除失败:" + e.getMessage()), HttpStatus.BAD_REQUEST);
+        }
+        return new ResponseEntity<>(new MessageResponse("删除成功"), HttpStatus.OK);
+    }
+
+    @GetMapping("/search")
+    public ResponseEntity<GetCourseListResponse> searchCourses(@RequestParam String token,
+                                                               @RequestParam(required = false) String title,
+                                                               @RequestParam(required = false) String author,
+                                                               @RequestParam(required = false) String description,
+                                                               @RequestParam(required = false) String sortOrder,
+                                                               @RequestParam Integer start,
+                                                               @RequestParam Integer end) {
+        if (start >= end) {
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+        }
+
+        try {
+            SearchCourseRequest request = new SearchCourseRequest(token, title, author, description, sortOrder, start, end);
+            List<Course> courses = courseService.searchCourses(request);
+            long courseCount = courseService.getCourseCountByCriteria(title, author, description, sortOrder);
+
+            return new ResponseEntity<>(new GetCourseListResponse(courseCount, courses), HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error("Search courses failed with parameters: title={}, author={}, description={}, sortOrder={}, start={}, end={}",
+                    title, author, description, sortOrder, start, end, e);
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+    @GetMapping("/sort")
+    public ResponseEntity<GetCourseListResponse> sortCourses(@RequestParam String token,
+                                                             @RequestParam String sortField,
+                                                             @RequestParam String sortDirection,
+                                                             @RequestParam Integer start,
+                                                             @RequestParam Integer end) {
+        if (start >= end) {
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+        }
+
+        try {
+            long courseCount = courseService.getCourseCount();
+            List<Course> sortedCourses = courseService.sortCourses(sortField, sortDirection, start, end);
+
+            return new ResponseEntity<>(new GetCourseListResponse(courseCount, sortedCourses), HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error("Sort courses failed with parameters: sortField={}, sortDirection={}, start={}, end={}",
+                    sortField, sortDirection, start, end, e);
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+}

src/main/java/org/cmh/backend/CourseManagement/controller/CourseFileController.java

@@ -0,0 +1,64 @@
+package org.cmh.backend.CourseManagement.controller;
+
+import org.cmh.backend.CourseManagement.dto.UploadFileResponse;
+import org.springframework.core.io.UrlResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.core.io.Resource;
+import org.springframework.web.multipart.MultipartFile;
+
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+@RestController
+@RequestMapping("/courses")
+public class CourseFileController {
+    private static final String UPLOAD_DIR = "uploads/";
+
+    @PostMapping("/upload")
+    public ResponseEntity<UploadFileResponse> uploadFile(@RequestParam("file") MultipartFile file) {
+        if (file.isEmpty()) {
+            return new ResponseEntity<>(new UploadFileResponse("文件不能为空", null), HttpStatus.BAD_REQUEST);
+        }
+
+        try {
+            // 确保上传目录存在
+            Path uploadDirPath = Paths.get(UPLOAD_DIR);
+            if (!Files.exists(uploadDirPath)) {
+                Files.createDirectories(uploadDirPath);
+            }
+
+            // 生成文件路径
+            byte[] bytes = file.getBytes();
+            Path path = Paths.get(UPLOAD_DIR + file.getOriginalFilename());
+            Files.write(path, bytes);
+
+            // 返回成功信息
+            return new ResponseEntity<>(new UploadFileResponse("文件上传成功", "/api/courses/files/" + file.getOriginalFilename()), HttpStatus.OK);
+        } catch (IOException e) {
+            return new ResponseEntity<>(new UploadFileResponse("文件上传失败", null), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+    @GetMapping("/files/{filename}")
+    public ResponseEntity<Resource> getFile(@PathVariable String filename) {
+        try {
+            Path filePath = Paths.get(UPLOAD_DIR).resolve(filename).normalize();
+            Resource resource = new UrlResource(filePath.toUri());
+
+            if (resource.exists() && resource.isReadable()) {
+                return ResponseEntity.ok()
+                        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + resource.getFilename() + "\"")
+                        .body(resource);
+            } else {
+                return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+            }
+        } catch (Exception e) {
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+}

src/main/java/org/cmh/backend/CourseManagement/dto/CourseRequest.java

@@ -0,0 +1,16 @@
+package org.cmh.backend.CourseManagement.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.cmh.backend.Utils.JwtRequest;
+
+@Getter
+@Setter
+public class CourseRequest extends JwtRequest {
+    private String title;
+    private String description;
+    private String orderNo;
+    private String author;
+    private String videoPath;
+    private String imagePath;
+}

src/main/java/org/cmh/backend/CourseManagement/dto/GetCourseListResponse.java

@@ -0,0 +1,16 @@
+package org.cmh.backend.CourseManagement.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import org.cmh.backend.CourseManagement.model.Course;
+
+import java.util.List;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class GetCourseListResponse {
+    Long courseCount;
+    List<Course> courseList;
+}

src/main/java/org/cmh/backend/CourseManagement/dto/MessageResponse.java

@@ -0,0 +1,12 @@
+package org.cmh.backend.CourseManagement.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class MessageResponse {
+    String message;
+}

src/main/java/org/cmh/backend/CourseManagement/dto/SearchCourseRequest.java

@@ -0,0 +1,18 @@
+package org.cmh.backend.CourseManagement.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class SearchCourseRequest {
+    private String token;
+    private String title;
+    private String author;
+    private String description;
+    private String sortOrder;
+    private int start;
+    private int end;
+}

src/main/java/org/cmh/backend/CourseManagement/dto/UploadFileResponse.java

@@ -0,0 +1,15 @@
+package org.cmh.backend.CourseManagement.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class UploadFileResponse extends MessageResponse {
+    private String url;
+
+    public UploadFileResponse(String message, String url) {
+        super(message);
+        this.url = url;
+    }
+}

src/main/java/org/cmh/backend/CourseManagement/model/Course.java

@@ -0,0 +1,21 @@
+package org.cmh.backend.CourseManagement.model;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Getter
+@Setter
+public class Course {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String title;
+    private String description;
+    private String orderNo;
+    private String author;
+    private String videoPath;
+    private String imagePath;
+}

src/main/java/org/cmh/backend/CourseManagement/repository/CourseRepository.java

@@ -0,0 +1,13 @@
+package org.cmh.backend.CourseManagement.repository;
+
+import org.cmh.backend.CourseManagement.model.Course;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+@Repository
+public interface CourseRepository extends JpaRepository<Course, Long>, JpaSpecificationExecutor<Course> {
+    Page<Course> findAllByOrderByIdDesc(Pageable pageable);
+}

src/main/java/org/cmh/backend/CourseManagement/service/CourseService.java

@@ -0,0 +1,82 @@
+package org.cmh.backend.CourseManagement.service;
+
+import org.cmh.backend.CourseManagement.dto.CourseRequest;
+import org.cmh.backend.CourseManagement.dto.SearchCourseRequest;
+import org.cmh.backend.CourseManagement.model.Course;
+import org.cmh.backend.CourseManagement.repository.CourseRepository;
+import org.cmh.backend.CourseManagement.specification.CourseSpecification;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import jakarta.persistence.EntityNotFoundException;
+import java.util.List;
+
+@Service
+public class CourseService {
+
+    @Autowired
+    private CourseRepository courseRepository;
+
+    public long getCourseCount() {
+        return courseRepository.count();
+    }
+
+    public List<Course> getCoursesByRange(int start, int end) {
+        Pageable pageable = PageRequest.of(start, end - start);
+        return courseRepository.findAll(pageable).getContent();
+    }
+
+    public Course getCourseById(Long id) {
+        return courseRepository.findById(id).orElseThrow(() -> new EntityNotFoundException("Course not found"));
+    }
+
+    public void createCourse(CourseRequest request) {
+        Course course = new Course();
+        course.setTitle(request.getTitle());
+        course.setAuthor(request.getAuthor());
+        course.setDescription(request.getDescription());
+        course.setOrderNo(request.getOrderNo());
+        course.setVideoPath(request.getVideoPath()); // 确保保存视频路径
+        course.setImagePath(request.getImagePath()); // 确保保存图片路径
+        courseRepository.save(course);
+    }
+
+    public void updateCourse(Long id, CourseRequest request) {
+        Course course = courseRepository.findById(id).orElseThrow(() -> new EntityNotFoundException("Course not found"));
+        course.setTitle(request.getTitle());
+        course.setAuthor(request.getAuthor());
+        course.setDescription(request.getDescription());
+        course.setOrderNo(request.getOrderNo());
+        course.setVideoPath(request.getVideoPath()); // 确保更新视频路径
+        course.setImagePath(request.getImagePath()); // 确保更新图片路径
+        courseRepository.save(course);
+    }
+
+    public void deleteCourse(Long id) {
+        courseRepository.deleteById(id);
+    }
+
+    public List<Course> searchCourses(SearchCourseRequest request) {
+        Pageable pageable = PageRequest.of(request.getStart(), request.getEnd() - request.getStart());
+        return courseRepository.findAll(
+                CourseSpecification.searchCourses(
+                        request.getTitle(),
+                        request.getAuthor(),
+                        request.getDescription(),
+                        request.getSortOrder()
+                ),
+                pageable
+        ).getContent();
+    }
+    public long getCourseCountByCriteria(String title, String author, String description, String sortOrder) {
+        return courseRepository.count(CourseSpecification.searchCourses(title, author, description, sortOrder));
+    }
+    public List<Course> sortCourses(String sortField, String sortDirection, int start, int end) {
+        Pageable pageable = PageRequest.of(start, end - start);
+        return courseRepository.findAll(
+                CourseSpecification.sortCourses(sortField, sortDirection),
+                pageable
+        ).getContent();
+    }
+}

src/main/java/org/cmh/backend/CourseManagement/specification/CourseSpecification.java

@@ -0,0 +1,44 @@
+package org.cmh.backend.CourseManagement.specification;
+
+import org.cmh.backend.CourseManagement.model.Course;
+import org.springframework.data.jpa.domain.Specification;
+
+import jakarta.persistence.criteria.Predicate;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CourseSpecification {
+
+    public static Specification<Course> searchCourses(
+            String title, String author, String description, String sortOrder) {
+
+        return (root, query, criteriaBuilder) -> {
+            List<Predicate> predicates = new ArrayList<>();
+
+            if (title != null && !title.isEmpty()) {
+                predicates.add(criteriaBuilder.like(root.get("title"), "%" + title + "%"));
+            }
+            if (author != null && !author.isEmpty()) {
+                predicates.add(criteriaBuilder.like(root.get("author"), "%" + author + "%"));
+            }
+            if (description != null && !description.isEmpty()) {
+                predicates.add(criteriaBuilder.like(root.get("description"), "%" + description + "%"));
+            }
+            if (sortOrder != null && !sortOrder.isEmpty()) {
+                predicates.add(criteriaBuilder.like(root.get("orderNo"), "%" + sortOrder+ "%"));
+            }
+
+            return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+        };
+    }
+    public static Specification<Course> sortCourses(String sortField, String sortDirection) {
+        return (root, query, cb) -> {
+            if ("asc".equalsIgnoreCase(sortDirection)) {
+                query.orderBy(cb.asc(root.get(sortField)));
+            } else if ("desc".equalsIgnoreCase(sortDirection)) {
+                query.orderBy(cb.desc(root.get(sortField)));
+            }
+            return cb.conjunction();
+        };
+    }
+}

src/main/java/org/cmh/backend/MeetingManagement/controller/MeetingController.java

@@ -0,0 +1,153 @@
+package org.cmh.backend.MeetingManagement.controller;
+
+import org.cmh.backend.MeetingManagement.model.Meeting;
+import org.cmh.backend.MeetingManagement.service.MeetingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/meetings")
+public class MeetingController {
+
+    @Autowired
+    private MeetingService meetingService;
+
+    private final DateTimeFormatter formatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+
+    @GetMapping("/listAll")
+    public ResponseEntity<List<Meeting>> listAll() {
+        List<Meeting> data = meetingService.getAllMeetings();
+        return ResponseEntity.ok(data);
+    }
+
+    @PostMapping("/addMeeting")
+    public ResponseEntity<Meeting> add(@RequestBody Map<String, String> credentials) {
+        try {
+            Meeting meeting = new Meeting();
+            if (credentials.get("id") != null) {
+                meeting.setId(Long.parseLong(credentials.get("id")));
+            }
+            meeting.setName(credentials.get("name"));
+            meeting.setOrganizer(credentials.get("organizer"));
+
+            // Parse startTime and endTime to OffsetDateTime, then convert to LocalDateTime
+            OffsetDateTime startTime = OffsetDateTime.parse(credentials.get("startTime"), formatter);
+            OffsetDateTime endTime = OffsetDateTime.parse(credentials.get("endTime"), formatter);
+            meeting.setStartTime(startTime.toLocalDateTime());
+            meeting.setEndTime(endTime.toLocalDateTime());
+
+            meeting.setContent(credentials.get("content"));
+            meeting.setStatus(credentials.get("status"));
+
+            Meeting meetingAdd = meetingService.createMeeting(meeting);
+            return new ResponseEntity<>(meetingAdd, HttpStatus.CREATED);
+        } catch (Exception e) {
+            return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
+        }
+    }
+
+    @PostMapping("/deleteMeeting")
+    public ResponseEntity<String> delete(@RequestBody Map<String, String> credentials) {
+        try {
+            meetingService.deleteMeeting(Long.valueOf(credentials.get("id")));
+            return new ResponseEntity<>("success", HttpStatus.OK);
+        } catch (Exception e) {
+            return new ResponseEntity<>("failure", HttpStatus.BAD_REQUEST);
+        }
+    }
+
+
+    @PostMapping("/updateMeeting")
+    public ResponseEntity<Meeting> update(@RequestBody Map<String, String> credentials) {
+        try {
+            // Validate and parse id
+            String idStr = credentials.get("id");
+            if (idStr == null || idStr.isEmpty()) {
+                throw new IllegalArgumentException("ID cannot be null or empty");
+            }
+            Long id = Long.parseLong(idStr);
+
+            // Validate and parse other fields
+            String name = credentials.get("name");
+            if (name == null || name.isEmpty()) {
+                throw new IllegalArgumentException("Name cannot be null or empty");
+            }
+
+            String organizer = credentials.get("organizer");
+            if (organizer == null || organizer.isEmpty()) {
+                throw new IllegalArgumentException("Organizer cannot be null or empty");
+            }
+
+            String startTimeStr = credentials.get("startTime");
+            if (startTimeStr == null || startTimeStr.isEmpty()) {
+                throw new IllegalArgumentException("Start time cannot be null or empty");
+            }
+            LocalDateTime startTime = LocalDateTime.parse(startTimeStr, DateTimeFormatter.ISO_LOCAL_DATE_TIME);
+
+            String endTimeStr = credentials.get("endTime");
+            if (endTimeStr == null || endTimeStr.isEmpty()) {
+                throw new IllegalArgumentException("End time cannot be null or empty");
+            }
+            LocalDateTime endTime = LocalDateTime.parse(endTimeStr, DateTimeFormatter.ISO_LOCAL_DATE_TIME);
+
+            String content = credentials.get("content");
+            if (content == null || content.isEmpty()) {
+                throw new IllegalArgumentException("Content cannot be null or empty");
+            }
+
+            String status = credentials.get("status");
+            if (status == null || status.isEmpty()) {
+                throw new IllegalArgumentException("Status cannot be null or empty");
+            }
+
+            // Create and update meeting
+            Meeting meeting = new Meeting();
+            meeting.setId(id);
+            meeting.setName(name);
+            meeting.setOrganizer(organizer);
+            meeting.setStartTime(startTime);
+            meeting.setEndTime(endTime);
+            meeting.setContent(content);
+            meeting.setStatus(status);
+
+            Meeting updatedMeeting = meetingService.updateMeeting(meeting.getId(), meeting);
+            return new ResponseEntity<>(updatedMeeting, HttpStatus.OK);
+        } catch (IllegalArgumentException e) {
+            return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
+        } catch (Exception e) {
+            return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    @PostMapping("/getMeetingById")
+    public ResponseEntity<Meeting> getById(@RequestBody Map<String, String> credentials) {
+        try {
+            Meeting meeting = meetingService.getMeetingById(Long.valueOf(credentials.get("id"))).orElse(null);
+            return new ResponseEntity<>(meeting, HttpStatus.OK);
+        } catch (Exception e) {
+            return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
+        }
+    }
+
+    @PostMapping("/searchMeetings")
+    public ResponseEntity<List<Meeting>> searchMeetings(@RequestBody Map<String, String> params) {
+        String name = params.get("name");
+        String organizer = params.get("organizer");
+        OffsetDateTime startTimeStr = OffsetDateTime.parse(params.get("startTime"), formatter);
+        LocalDateTime startTime1 = (startTimeStr.toLocalDateTime());
+        //LocalDateTime startTime = startTimeStr != null ? LocalDateTime.parse(startTimeStr) : null;
+
+        List<Meeting> meetings = meetingService.searchMeetings(name, organizer, startTime1);
+        return new ResponseEntity<>(meetings, HttpStatus.OK);
+    }
+
+}

src/main/java/org/cmh/backend/MeetingManagement/model/Meeting.java

@@ -0,0 +1,48 @@
+package org.cmh.backend.MeetingManagement.model;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+import java.time.LocalDateTime;
+
+@Setter
+@Getter
+@Entity
+public class Meeting {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    private String name;
+    private String organizer;
+    private LocalDateTime startTime;  // Changed to LocalDateTime
+    private LocalDateTime endTime;    // Changed to LocalDateTime
+    private String content;
+    private String status;
+
+    public Meeting() {}
+
+    public Meeting(String name, String organizer, LocalDateTime startTime, LocalDateTime endTime, String content, String status) {
+        this.name = name;
+        this.organizer = organizer;
+        this.startTime = startTime;
+        this.endTime = endTime;
+        this.content = content;
+        this.status = status;
+    }
+
+    @Override
+    public String toString() {
+        return "Meeting{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                ", organizer='" + organizer + '\'' +
+                ", startTime=" + startTime +
+                ", endTime=" + endTime +
+                ", content='" + content + '\'' +
+                ", status='" + status + '\'' +
+                '}';
+    }
+}

src/main/java/org/cmh/backend/MeetingManagement/repository/MeetingRepository.java

@@ -0,0 +1,15 @@
+package org.cmh.backend.MeetingManagement.repository;
+
+import org.cmh.backend.MeetingManagement.model.Meeting;
+import org.springframework.data.jpa.repository.JpaRepository;
+import java.time.LocalDateTime;
+import java.util.List;
+import org.springframework.data.jpa.repository.Query;
+
+public interface MeetingRepository extends JpaRepository<Meeting, Long> {
+    @Query("SELECT m FROM Meeting m WHERE " +
+            "(?1 IS NULL OR m.name LIKE %?1%) AND " +
+            "(?2 IS NULL OR m.organizer LIKE %?2%) AND " +
+            "(?3 IS NULL OR m.startTime >= ?3)")
+    List<Meeting> searchMeetings(String name, String organizer, LocalDateTime startTime);
+}

src/main/java/org/cmh/backend/MeetingManagement/service/MeetingService.java

@@ -0,0 +1,74 @@
+package org.cmh.backend.MeetingManagement.service;
+
+import org.cmh.backend.MeetingManagement.model.Meeting;
+import org.cmh.backend.MeetingManagement.repository.MeetingRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+
+@Service
+public class MeetingService {
+    @Autowired
+    private MeetingRepository meetingRepository;
+
+    public List<Meeting> getAllMeetings() {
+        return meetingRepository.findAll();
+    }
+
+    public Optional<Meeting> getMeetingById(Long id) {
+        return meetingRepository.findById(id);
+    }
+
+    public Meeting createMeeting(Meeting meeting) {
+        validateMeeting(meeting);
+        return meetingRepository.save(meeting);
+    }
+
+    public Meeting updateMeeting(Long id, Meeting meetingDetails) {
+        validateMeeting(meetingDetails);
+        Meeting meeting = meetingRepository.findById(id)
+                .orElseThrow(() -> new RuntimeException("Meeting not found with id " + id));
+        meeting.setName(meetingDetails.getName());
+        meeting.setOrganizer(meetingDetails.getOrganizer());
+        meeting.setStartTime(meetingDetails.getStartTime());
+        meeting.setEndTime(meetingDetails.getEndTime());
+        meeting.setContent(meetingDetails.getContent());
+        meeting.setStatus(meetingDetails.getStatus());
+        return meetingRepository.save(meeting);
+    }
+
+    public void deleteMeeting(Long id) {
+        Meeting meeting = meetingRepository.findById(id)
+                .orElseThrow(() -> new RuntimeException("Meeting not found with id " + id));
+        meetingRepository.delete(meeting);
+    }
+
+    private void validateMeeting(Meeting meeting) {
+        if (meeting.getName() == null || meeting.getName().isEmpty()) {
+            throw new RuntimeException("会议名称不能为空");
+        }
+        if (meeting.getOrganizer() == null || meeting.getOrganizer().isEmpty()) {
+            throw new RuntimeException("组织者不能为空");
+        }
+        if (meeting.getStartTime() == null) {
+            throw new RuntimeException("开始时间不能为空");
+        }
+        if (meeting.getEndTime() == null) {
+            throw new RuntimeException("结束时间不能为空");
+        }
+        if (meeting.getStatus() == null || meeting.getStatus().isEmpty()) {
+            throw new RuntimeException("状态不能为空");
+        }
+    }
+
+
+        public List<Meeting> searchMeetings(String name, String organizer, LocalDateTime startTime) {
+            // 根据条件搜索会议
+            return meetingRepository.searchMeetings(name, organizer, startTime);
+        }
+    }
+
+

src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java

@@ -33,18 +33,12 @@ public class NewsController {
     public ResponseEntity<GetNewsListResponse> getNewsByRange(@RequestParam Integer start, @RequestParam Integer end, @RequestParam String token) {
         String username = JwtUtil.extractUsername(token);
         UserHS user = userService.getUserByUsername(username);
-        // TODO:完善用户权限
-        if (user.getSuperAdmin()) {
-
-        } else {
-
-        }
-
         if (start >= end) {
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
-        long newsCount = newsService.getNewsCount();
+        List<News> newsList = newsService.getNewsByRange(start, end, user);
-        return new ResponseEntity<>(new GetNewsListResponse(newsCount, newsService.getNewsByRange(start, end, user)), HttpStatus.OK);
+        long newsCount = newsList.size();
+        return new ResponseEntity<>(new GetNewsListResponse(newsCount, newsList), HttpStatus.OK);
     }
 
     @PostMapping("/search")

src/main/java/org/cmh/backend/NewsManagement/controller/NewsFileController.java

@@ -15,12 +15,12 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 
 @RestController
-@CrossOrigin // 如果前端和后端不在同一个域名或端口下，需要启用跨域
+@RequestMapping("/news")
-public class FileController {
+public class NewsFileController {
 
     private static final String UPLOAD_DIR = "uploads/";
 
-    @PostMapping("/news/uploadPic")
+    @PostMapping("/uploadPic")
     public ResponseEntity<UploadFileResponse> uploadFile(@RequestParam("file") MultipartFile file) {
         if (file.isEmpty()) {
             return new ResponseEntity<>(new UploadFileResponse("文件不能为空", null), HttpStatus.BAD_REQUEST);
@@ -45,7 +45,7 @@ public class FileController {
         }
     }
 
-    @GetMapping("/news/files/{filename}")
+    @GetMapping("/files/{filename}")
     public ResponseEntity<Resource> getFile(@PathVariable String filename) {
         try {
             Path filePath = Paths.get(UPLOAD_DIR).resolve(filename).normalize();

src/main/java/org/cmh/backend/NewsManagement/service/NewsService.java

@@ -51,7 +51,7 @@ public class NewsService {
             if (user.getSuperAdmin()) {
                 newsPage = newsRepository.findAllByOrderByIdDesc(pageable);
             } else {
-                newsPage = newsRepository.findByTenantOrderByIdDesc(user.getUsername(), pageable);
+                newsPage = newsRepository.findByTenantOrderByIdDesc(user.getTenant(), pageable);
             }
 
             if (newsPage.hasContent()) {
@@ -73,6 +73,11 @@ public class NewsService {
 
 
     public void createNews(NewsRequest request) {
+        String username = JwtUtil.extractUsername(request.getToken());
+        UserHS user = userService.getUserByUsername(username);
+        if (!user.getSuperAdmin() && !user.getTenant().equals(request.getTenant())){
+            throw new IllegalArgumentException("只能在自己的租户的名下新增新闻！");
+        }
         News news = new News();
         news.setTitle(request.getTitle());
         news.setSummary(request.getSummary());
@@ -91,7 +96,9 @@ public class NewsService {
             news.setContent(request.getContent());
             news.setAuthor(request.getAuthor());
             news.setImagePath(request.getImagePath());
+            if (userService.getUserByUsername(JwtUtil.extractUsername(request.getToken())).getSuperAdmin()) {
                 news.setTenant(request.getTenant());
+            }
             newsRepository.save(news);
         }
     }
@@ -114,26 +121,6 @@ public class NewsService {
         return newsRepository.count();
     }
 
-    // TODO:完善用户权限
-//    public List<News> searchNews(SearchNewsRequest request) {
-//        String username = JwtUtil.extractUsername(request.getToken());
-//        UserHS user = userService.getUserByUsername(username);
-//        if (user.getSuperAdmin()) {
-//            return newsRepository.findByTitleContainingOrSummaryContainingOrAuthorContainingOrImagePathContaining(
-//                    request.getTitle(),
-//                    request.getSummary(),
-//                    request.getAuthor(),
-//                    request.getImagePath()
-//            );
-//        }
-//        return newsRepository.findByTitleContainingOrSummaryContainingOrAuthorContainingOrImagePathContainingAndTenantEquals(
-//                request.getTitle(),
-//                request.getSummary(),
-//                request.getAuthor(),
-//                request.getImagePath(),
-//                user.getUsername()
-//        );
-//    }
     public List<News> searchNews(SearchNewsRequest request) {
         String username = JwtUtil.extractUsername(request.getToken());
         UserHS user = userService.getUserByUsername(username);

src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java

@@ -0,0 +1,75 @@
+package org.cmh.backend.OrganizationManagement.controller;
+
+import org.cmh.backend.OrganizationManagement.model.Organization;
+import org.cmh.backend.OrganizationManagement.service.OrganizationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import static org.springframework.http.ResponseEntity.ok;
+
+@RestController
+@RequestMapping("/organizations")
+public class OrganizationController {
+    @Autowired
+    private OrganizationService organizationService;
+
+    @GetMapping("/listAll")
+    public ResponseEntity<List<Organization>> listAll() {
+        List<Organization> data = organizationService.listAll();
+//        System.out.println(data);
+        return ok(data);
+    }
+
+    @PostMapping("/addOrganization")
+    public Organization add(@RequestBody Map<String, String> credentials) {
+        Organization organization = new Organization();
+        if (credentials.get("organizationId") != null) {
+            organization.setOrganizationId(Long.parseLong(credentials.get("organizationId")));
+        }
+        organization.setOrganizationName(credentials.get("organizationName"));
+        organization.setOrganizationStatus(Boolean.parseBoolean(credentials.get("organizationStatus")));
+        if (Integer.parseInt(credentials.get("parentOrganization")) != 0) {
+            organization.setParentOrganization(organizationService.getById(Long.parseLong(credentials.get("parentOrganization"))));
+        } else {
+            organization.setParentOrganization(null);
+        }
+        organization.setEmail(credentials.get("email"));
+        organization.setLeader(credentials.get("leader"));
+        organization.setContactPhone(credentials.get("contactPhone"));
+        organization.setDisplayOrder(Integer.parseInt(credentials.get("displayOrder")));
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        String currentTime = sdf.format(new Date());
+        System.out.println(currentTime);
+
+        organization.setCreatedTime(currentTime);
+        Organization organizationAdd = organizationService.add(organization);
+        System.out.println(organizationAdd);
+        return organizationAdd;
+    }
+
+
+    @PostMapping("/deleteOrganization")
+    public String delete(@RequestBody Map<String, String> credentials) {
+        organizationService.delete(Long.valueOf(credentials.get("organizationId")));
+        return "success";
+    }
+
+    @PostMapping("/update")
+    public Organization update(@RequestBody Organization organization) {
+        return organizationService.update(organization);
+    }
+
+    @PostMapping("/getOrganizationById")
+    public Organization getById(@RequestBody Map<String, String> credentials) {
+        return organizationService.getById(Long.valueOf(credentials.get("organizationId")));
+    }
+
+    //ublic
+}

src/main/java/org/cmh/backend/OrganizationManagement/model/Organization.java

@@ -0,0 +1,70 @@
+package org.cmh.backend.OrganizationManagement.model;
+
+import jakarta.persistence.*;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Table(name = "organizations")
+@Entity
+public class Organization  {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Setter
+    @Getter
+    private long organizationId;      // 部门ID，作为数据库表的主键
+    @Setter
+    @Getter
+    @ManyToOne
+    @JoinColumn(name = "parent_organization_id")
+    private Organization parentOrganization;  // 上级部门，如果有的话
+    @Setter
+    @Getter
+    private String organizationName;  // 部门名称
+    @Setter
+    @Getter
+    private int displayOrder;      // 显示排序
+    @Setter
+    @Getter
+    private String leader;           // 负责人
+    @Setter
+    @Getter
+    private String contactPhone;   // 联系电话
+    @Setter
+    @Getter
+    private String email;          // 邮箱
+    @Setter
+    @Getter
+    private boolean organizationStatus;
+    @Setter
+    @Getter
+    private String createdTime;
+
+    public Organization() {
+    }
+
+    public Organization(Organization organization, String organizationName, int displayOrder, String leader, String contactPhone, String email, boolean organizationStatus) {
+        this.parentOrganization = organization;
+        this.organizationName = organizationName;
+        this.displayOrder = displayOrder;
+        this.leader = leader;
+        this.contactPhone = contactPhone;
+        this.email = email;
+        this.organizationStatus = organizationStatus;
+    }
+
+    @Override
+    public String toString() {
+        return "Organization{" +
+                "organizationId=" + organizationId +
+                ", parentOrganization='" + parentOrganization + '\'' +
+                ", organizationName='" + organizationName + '\'' +
+                ", displayOrder=" + displayOrder +
+                ", leader='" + leader + '\'' +
+                ", contactPhone='" + contactPhone + '\'' +
+                ", email='" + email + '\'' +
+                ", organizationStatus='" + organizationStatus + '\'' +
+                '}';
+    }
+}

src/main/java/org/cmh/backend/OrganizationManagement/repository/OrganizationRepository.java

@@ -0,0 +1,20 @@
+package org.cmh.backend.OrganizationManagement.repository;
+
+import org.aspectj.weaver.ast.Or;
+import org.cmh.backend.OrganizationManagement.model.Organization;
+import org.cmh.backend.OrganizationManagement.service.OrganizationService;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface OrganizationRepository extends JpaRepository<Organization, Long> {
+
+    List<Organization> findAll();
+    Organization save(Organization organization);
+    void deleteById(Long id);
+    Organization findByOrganizationId(Long id);
+    Organization findByOrganizationName(String name);
+
+}

src/main/java/org/cmh/backend/OrganizationManagement/service/OrganizationService.java

@@ -0,0 +1,36 @@
+package org.cmh.backend.OrganizationManagement.service;
+
+import org.cmh.backend.OrganizationManagement.model.Organization;
+import org.cmh.backend.OrganizationManagement.repository.OrganizationRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class OrganizationService {
+    @Autowired
+    private OrganizationRepository organizationRepository;
+
+    public List<Organization> listAll(){
+        return organizationRepository.findAll();
+    }
+
+    public Organization add(Organization organization){
+        return organizationRepository.save(organization);
+    }
+    public Organization update(Organization organization){
+        return organizationRepository.save(organization);
+    }
+    public String delete(Long id){
+        organizationRepository.deleteById(id);
+        return "success";
+    }
+    public Organization getById(Long organizationId){
+        return organizationRepository.findByOrganizationId(organizationId);
+    }
+    public Organization getByName(String name){
+        return organizationRepository.findByOrganizationName(name);
+    }
+
+}

src/main/java/org/cmh/backend/UserManagement/adpter/User2UserHS.java

@@ -0,0 +1,25 @@
+package org.cmh.backend.UserManagement.adpter;
+
+import org.cmh.backend.UserManagement.model.User;
+import org.cmh.backend.authentication.model.UserHS;
+
+import java.time.LocalDateTime;
+
+public class User2UserHS {
+    private String tenant;
+    public static UserHS convert(User user,String tenant) {
+        UserHS userHS = new UserHS();
+        userHS.setUsername(user.getAccount());
+        userHS.setPassword(user.getPassword());
+        userHS.setNickname(user.getName());
+        userHS.setDepartment(user.getOrganization());
+        userHS.setGender(user.getGender());
+        userHS.setEmail(user.getEmail());
+        userHS.setPhoneNumber(user.getPhone());
+        userHS.setRole("用户");
+        userHS.setCreatedAt(LocalDateTime.now());
+        userHS.setTenant(tenant);
+        return userHS;
+   }
+
+}

src/main/java/org/cmh/backend/UserManagement/adpter/UserHS2User.java

@@ -0,0 +1,28 @@
+package org.cmh.backend.UserManagement.adpter;
+
+import org.cmh.backend.UserManagement.model.User;
+import org.cmh.backend.authentication.model.UserHS;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class UserHS2User {
+    public static User convert(UserHS userHS) {
+        User user = new User();
+        user.setId(userHS.getId());
+        user.setAccount(userHS.getUsername());
+        user.setPassword(userHS.getPassword());
+        user.setName(userHS.getNickname());
+        user.setOrganization(userHS.getDepartment());
+        user.setGender(userHS.getGender());
+        user.setEmail(userHS.getEmail());
+        user.setPhone(userHS.getPhoneNumber());
+        return user;
+    }
+    //不确定这个能不能用XD
+    public static List<User> convertList(List<UserHS> userHSList) {
+        return userHSList.stream()
+                .map(UserHS2User::convert)
+                .collect(Collectors.toList());
+    }
+}

src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java

@@ -0,0 +1,100 @@
+package org.cmh.backend.UserManagement.controller;
+
+import jakarta.transaction.Transactional;
+import org.cmh.backend.UserManagement.dto.TenantOptionsResponse;
+import org.cmh.backend.UserManagement.model.Tenant;
+import org.cmh.backend.UserManagement.model.User;
+import org.cmh.backend.UserManagement.service.TenantManagementService;
+import org.cmh.backend.Utils.JwtUtil;
+import org.cmh.backend.Utils.JwtVerify;
+import org.cmh.backend.authentication.model.UserHS;
+import org.cmh.backend.authentication.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@RestController
+@RequestMapping("/tenant")
+public class TenantManagementController {
+    @Autowired
+    private TenantManagementService tenantManagementService;
+    @Autowired
+    private UserService userService;
+
+    private boolean isAdmin(String token) {
+        UserHS user = userService.getUserByUsername(JwtUtil.extractUsername(token));
+        return user.getSuperAdmin();
+    }
+
+    @PostMapping("/addTenant")
+    @JwtVerify
+    public Tenant addTenant(@RequestBody Tenant tenant, @RequestParam String token) {
+        if (isAdmin(token)) {
+            Tenant tenant1 = tenantManagementService.registerTenant(tenant);
+            UserHS newUser = new UserHS();
+            newUser.setUsername(tenant.getManager());
+            newUser.setPassword(tenant.getSymbol());
+            newUser.setRole("企业管理员");
+            newUser.setTenant(tenant.getName());
+            newUser.setGender("男");
+            newUser.setNickname(tenant.getManager());
+            newUser.setEmail(tenant.getContact());
+            newUser.setDepartment("企业管理员");
+            newUser.setCreatedAt(LocalDateTime.now());
+            newUser.setPhoneNumber(tenant.getPhone());
+            userService.addUser(newUser);
+            System.out.println(tenant.toString());
+            return tenant1;
+        }
+        return null;
+    }
+
+    @GetMapping("/getAllTenant")
+    @JwtVerify
+    public List<Tenant> getAll(@RequestParam String token) {
+        if (isAdmin(token)) {
+            return tenantManagementService.findAll();
+        } else {
+            return null;
+        }
+    }
+
+    @GetMapping("/getTenantOptions")
+    @JwtVerify
+    public ResponseEntity<TenantOptionsResponse> getAllForNews(@RequestParam String token) {
+        tenantManagementService.findAll();
+        try {
+            List<String> options = tenantManagementService.findAll().stream()
+                    .map(Tenant::getName)
+                    .toList();
+            return new ResponseEntity<>(new TenantOptionsResponse(options, "请求成功"), HttpStatus.OK);
+        } catch (Exception e) {
+            return new ResponseEntity<>(new TenantOptionsResponse(null, "请求失败" + e.getMessage()), HttpStatus.BAD_REQUEST);
+        }
+    }
+
+    @PostMapping("/updateTenant")
+    @JwtVerify
+    public Tenant update(@RequestBody Tenant tenant, @RequestParam String token) {
+        if (isAdmin(token)) {
+            tenantManagementService.update(tenant);
+            return tenant;
+        }
+        return null;
+    }
+
+    @PostMapping("/deleteTenant")
+    @Transactional
+    @JwtVerify
+    public void delete(@RequestBody User user, @RequestParam String token) {
+        if (isAdmin(token)){
+            tenantManagementService.delete(user.getId());
+        }
+    }
+
+}
+

src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java

@@ -0,0 +1,117 @@
+package org.cmh.backend.UserManagement.controller;
+
+import jakarta.transaction.Transactional;
+import org.cmh.backend.OrganizationManagement.service.OrganizationService;
+import org.cmh.backend.UserManagement.adpter.User2UserHS;
+import org.cmh.backend.UserManagement.adpter.UserHS2User;
+import org.cmh.backend.UserManagement.model.User;
+import org.cmh.backend.UserManagement.service.UserManagementService;
+import org.cmh.backend.Utils.JwtUtil;
+import org.cmh.backend.Utils.JwtVerify;
+import org.cmh.backend.authentication.dto.UserProfileResponse;
+import org.cmh.backend.authentication.model.UserHS;
+import org.cmh.backend.authentication.repository.UserRepository;
+import org.cmh.backend.authentication.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/user")
+public class UserManagementController {
+    @Autowired
+    private UserManagementService userManagementService;
+    @Autowired
+    private OrganizationService organizationService;
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private UserRepository userRepository;
+
+    @PostMapping("/addUser")
+    @JwtVerify
+    public ResponseEntity<UserProfileResponse> addUser(@RequestBody User user,@RequestParam String token) {
+        String username = JwtUtil.extractUsername(token);
+        UserHS operationUser = userService.getUserByUsername(username);
+
+        UserHS newuser = User2UserHS.convert(user,operationUser.getTenant());
+        UserProfileResponse response = new UserProfileResponse(
+                newuser.getUsername(),
+                newuser.getNickname(),
+                newuser.getGender(),
+                newuser.getPhoneNumber(),
+                newuser.getEmail(),
+                newuser.getDepartment(),
+                newuser.getRole(),
+                newuser.getCreatedAt()
+        );
+        if (organizationService.getByName(newuser.getDepartment()) != null) {
+            userService.addUser(newuser);
+            return new ResponseEntity<>(response, HttpStatus.OK);
+        } else {
+            return null;
+        }
+    }
+
+
+    @GetMapping("/getAll")
+    @JwtVerify
+    public List<User> getAll(@RequestParam String token) {
+        String username = JwtUtil.extractUsername(token);
+        UserHS userHS = userService.getUserByUsername(username);
+        if (userHS.getSuperAdmin()) {
+            return UserHS2User.convertList(userService.getAllUsers());
+        } else {
+            return UserHS2User.convertList(userService.getUsersByTenant(userHS.getTenant()));
+        }
+    }
+
+
+    @PostMapping("/update")
+    public ResponseEntity<UserProfileResponse> update(@RequestBody User user,@RequestParam String token) {
+        String username = JwtUtil.extractUsername(token);
+        UserHS operationUser = userService.getUserByUsername(username);
+        UserHS reqUser = User2UserHS.convert(user, operationUser.getTenant());
+        UserHS tarUser = userService.getUserByUsername(reqUser.getUsername());
+        if (tarUser != null) {
+//            tarUser.setNickname(reqUser.getNickname());
+//            tarUser.setGender(reqUser.getGender());
+//            tarUser.setPhoneNumber(reqUser.getPhoneNumber());
+//            tarUser.setEmail(reqUser.getEmail());
+//            tarUser.setRole(reqUser.getRole());
+            reqUser.setId(tarUser.getId());
+            UserProfileResponse response = new UserProfileResponse(
+                    reqUser.getUsername(),
+                    reqUser.getNickname(),
+                    reqUser.getGender(),
+                    reqUser.getPhoneNumber(),
+                    reqUser.getEmail(),
+                    reqUser.getDepartment(),
+                    reqUser.getRole(),
+                    reqUser.getCreatedAt()
+            );
+            if (organizationService.getByName(reqUser.getDepartment()) == null) {
+                return new ResponseEntity<>(null, HttpStatus.OK);
+            }
+            userRepository.save(reqUser);
+            return new ResponseEntity<>(response, HttpStatus.OK);
+        } else {
+            return new ResponseEntity<>(null, HttpStatus.OK);
+        }
+    }
+
+
+    @PostMapping("/delete")
+    @Transactional
+    public void delete(@RequestBody User user) {
+        UserHS userHS = userService.getUserByUsername(user.getAccount());
+        if (userHS != null) {
+            //根据用户名删除用户
+            userService.deleteUser(userHS.getUsername());
+        }
+    }
+}
+

src/main/java/org/cmh/backend/UserManagement/dto/TenantOptionsResponse.java

@@ -0,0 +1,18 @@
+package org.cmh.backend.UserManagement.dto;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import org.cmh.backend.NewsManagement.dto.MessageResponse;
+import org.cmh.backend.UserManagement.model.Tenant;
+
+import java.util.List;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class TenantOptionsResponse {
+    List<String> options;
+    String message;
+}

src/main/java/org/cmh/backend/UserManagement/model/Tenant.java

@@ -0,0 +1,23 @@
+package org.cmh.backend.UserManagement.model;
+
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+import org.cmh.backend.authentication.model.UserHS;
+
+@Entity
+@Getter
+@Setter
+@Table(name="tenant")
+public class Tenant {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    private String contact;  // 联系人
+    private String phone;  // 联系人电话
+    @Column(unique = true)
+    private String name;  // 租户名称
+    private String manager;  // 租户管理员
+    private String symbol;  // 租户标识
+}

src/main/java/org/cmh/backend/UserManagement/model/User.java

@@ -0,0 +1,53 @@
+package org.cmh.backend.UserManagement.model;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Setter
+@Getter
+public class User {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    private String account;
+    private String password;
+    private String name;
+    private String organization;
+    private String gender;
+    private String email;
+    private String phone;
+
+    public User() {
+
+    }
+
+    public User(String account, String password, String name, String organization, String gender, String email, String phone) {
+        this.account = account;
+        this.password = password;
+        this.name = name;
+        this.organization = organization;
+        this.gender = gender;
+        this.email = email;
+        this.phone = phone;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" +
+                "id=" + id +
+                ", account='" + account + '\'' +
+                ", password='" + password + '\'' +
+                ", name='" + name + '\'' +
+                ", organization='" + organization + '\'' +
+                ", gender='" + gender + '\'' +
+                ", email='" + email + '\'' +
+                ", phone='" + phone + '\'' +
+                '}';
+    }
+
+}

src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java

@@ -0,0 +1,17 @@
+package org.cmh.backend.UserManagement.repository;
+import org.cmh.backend.UserManagement.model.Tenant;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+public interface TenantManagementRepository extends JpaRepository<Tenant, Long>{
+    Tenant findByName(String name);
+    Tenant save(Tenant tenant);
+
+    List<Tenant> findAll();
+
+    Tenant findTenantById(Long id);
+
+    Tenant deleteByName(String Name);
+
+    void deleteById(Long id);
+}

src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java

@@ -0,0 +1,24 @@
+package org.cmh.backend.UserManagement.repository;
+
+
+import org.cmh.backend.UserManagement.model.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface UserManagementRepository extends JpaRepository<User, Long> {
+    User findByName(String name);
+    User findByAccountAndPassword(String name,String password);
+    User save(User user);
+
+    List<User> findAll();
+
+    User findUserById(Long id);
+
+    User deleteByAccount(String account);
+
+    void deleteById(Long id);
+
+}

src/main/java/org/cmh/backend/UserManagement/repository/UserRepositoryTemp.java

@@ -0,0 +1,13 @@
+package org.cmh.backend.UserManagement.repository;
+
+import org.cmh.backend.UserManagement.model.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserRepositoryTemp extends JpaRepository<User, Long> {
+    User findByName(String name);
+    User findByAccountAndPassword(String name,String password);
+    User save(User user);
+
+}

src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java

@@ -0,0 +1,28 @@
+package org.cmh.backend.UserManagement.service;
+
+import org.cmh.backend.UserManagement.model.Tenant;
+import org.cmh.backend.UserManagement.repository.TenantManagementRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+@Service
+public class TenantManagementService {
+
+    @Autowired
+    private TenantManagementRepository tenantManagementRepository;
+
+    public Tenant registerTenant(Tenant tenant) {
+        return tenantManagementRepository.save(tenant);
+    }
+
+    public List<Tenant> findAll(){
+        return tenantManagementRepository.findAll();
+    }
+
+    public Tenant update(Tenant tenant){return tenantManagementRepository.save(tenant);}
+
+    public Tenant delete(String name){return tenantManagementRepository.deleteByName(name);}
+
+    public void delete(Long id){tenantManagementRepository.deleteById(id);}
+}

src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java

@@ -0,0 +1,31 @@
+package org.cmh.backend.UserManagement.service;
+
+import org.cmh.backend.UserManagement.repository.UserManagementRepository;
+import org.cmh.backend.UserManagement.model.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+@Service
+public class UserManagementService {
+
+    @Autowired
+    private UserManagementRepository userManagementRepository;
+
+
+    public User registerUser(User user) {
+        User savedUser = userManagementRepository.save(user);
+        return savedUser;
+    }
+
+    public List<User> findAll(){
+        return userManagementRepository.findAll();
+    }
+
+    public User findUserById(Long id){return userManagementRepository.findUserById(id);}
+
+    public User update(User user){return userManagementRepository.save(user);}
+
+    public void delete(Long id){userManagementRepository.deleteById(id);}
+
+}

src/main/java/org/cmh/backend/UserManagement/service/UserServiceTemp.java

@@ -0,0 +1,24 @@
+package org.cmh.backend.UserManagement.service;
+
+import org.cmh.backend.UserManagement.model.User;
+import org.cmh.backend.UserManagement.repository.UserRepositoryTemp;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserServiceTemp {
+    @Autowired
+    private UserRepositoryTemp userRepository;
+
+    public User getUserByUsername(String username) {
+        return userRepository.findByName(username);
+    }
+    public User getUserByAccountAndPassword(String name,String password){return userRepository.findByAccountAndPassword(name,password);}
+
+    public User registerUser(User user) {
+        User savedUser = userRepository.save(user);
+        return savedUser;
+    }
+
+
+}

src/main/java/org/cmh/backend/authentication/dto/ProfileResponse.java

@@ -0,0 +1,19 @@
+package org.cmh.backend.authentication.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class ProfileResponse {
+    private String username;
+    private String email;
+    private String role;
+    private String phoneNumber;
+    private String company;
+    private LocalDateTime createdDate;
+}

src/main/java/org/cmh/backend/authentication/dto/UpdateRequest.java

@@ -0,0 +1,15 @@
+package org.cmh.backend.authentication.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class UpdateRequest {
+    private String username;
+    private String email;
+    private String phoneNumber;
+    private String company;
+}

src/main/java/org/cmh/backend/authentication/model/UserHS.java

@@ -26,4 +26,5 @@ public class UserHS {
     private String role;
     private LocalDateTime createdAt;
     private Boolean superAdmin = false;
+    private String tenant;
 }

src/main/java/org/cmh/backend/authentication/repository/UserRepository.java

@@ -3,6 +3,12 @@ package org.cmh.backend.authentication.repository;
 import org.cmh.backend.authentication.model.UserHS;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface UserRepository extends JpaRepository<UserHS, Long> {
     UserHS findByUsername(String username);
+
+    Integer deleteByUsername(String username);
+
+    List<UserHS> findByTenant(String tenant);
 }

src/main/java/org/cmh/backend/authentication/service/UserService.java

@@ -1,5 +1,7 @@
 package org.cmh.backend.authentication.service;
 
+import org.cmh.backend.UserManagement.model.Tenant;
+import org.cmh.backend.UserManagement.repository.TenantManagementRepository;
 import org.cmh.backend.authentication.dto.ChangePasswordRequest;
 import org.cmh.backend.authentication.dto.ManageUserProfileRequest;
 import org.cmh.backend.authentication.dto.RegisterRequest;
@@ -11,12 +13,15 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.regex.Pattern;
 
 @Service
 public class UserService {
     @Autowired
     private UserRepository userRepository;
+    @Autowired
+    private TenantManagementRepository tenantRepository;
 
     private final PasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
 
@@ -46,13 +51,61 @@ public class UserService {
         newUser.setUsername(username);
         newUser.setPassword(encodedPassword);
         newUser.setPhoneNumber(phoneNumber);
+        newUser.setRole("企业管理员");
+        newUser.setTenant(username);
+        newUser.setGender("男");
+        newUser.setNickname(username);
+        newUser.setEmail("user@example.com");
+        newUser.setDepartment("企业管理员");
         newUser.setCreatedAt(LocalDateTime.now());
 
         userRepository.save(newUser);
 
+        Tenant newTenant = new Tenant();
+        newTenant.setName(username);
+        newTenant.setPhone(phoneNumber);
+        newTenant.setManager(username);
+        newTenant.setSymbol(username);
+        newTenant.setContact(username);
+        tenantRepository.save(newTenant);
+
         return true;
     }
 
+    public boolean addUser(UserHS user) {
+        String username = user.getUsername();
+        String password = user.getPassword();
+        String phoneNumber = user.getPhoneNumber();
+        // 验证用户名是否已存在
+        if (userRepository.findByUsername(username) != null) {
+            return false; // 用户已存在
+        }
+
+        // 验证输入格式
+        if (!isValidUsername(username) || !isValidPassword(password) || !isValidContactInfo(phoneNumber)) {
+            throw new IllegalArgumentException();
+        }
+
+        // 加密密码
+        String encodedPassword = passwordEncoder.encode(password);
+        user.setPassword(encodedPassword);
+
+        userRepository.save(user);
+        return true;
+    }
+
+    public Integer deleteUser(String username){
+        return userRepository.deleteByUsername(username);
+    }
+
+    public List<UserHS> getAllUsers() {
+        return userRepository.findAll();
+    }
+
+    public List<UserHS> getUsersByTenant(String tenant){
+        return userRepository.findByTenant(tenant);
+    }
+
     public boolean loginUser(String username, String password) {
         UserHS user = userRepository.findByUsername(username);
         return user != null && passwordEncoder.matches(password, user.getPassword());

src/main/resources/application.properties

@@ -23,7 +23,8 @@ server.servlet.encoding.charset=utf-8
 # verificationCode
 verification.code.images.path=src/main/resources/static/verificationCodeImages
 # set the max size of a single file
-spring.servlet.multipart.max-file-size=50MB
+spring.servlet.multipart.max-file-size=500MB
 # set the max size of the total request
-spring.servlet.multipart.max-request-size=50MB
+spring.servlet.multipart.max-request-size=500MB
+
 

src/test/java/org/cmh/backend/BackendApplicationTests.java

@@ -1,15 +0,0 @@
-package org.cmh.backend;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-
-@Import(TestcontainersConfiguration.class)
-@SpringBootTest
-class BackendApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}

src/test/java/org/cmh/backend/TestBackendApplication.java

@@ -1,11 +0,0 @@
-package org.cmh.backend;
-
-import org.springframework.boot.SpringApplication;
-
-public class TestBackendApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.from(BackendApplication::main).with(TestcontainersConfiguration.class).run(args);
-	}
-
-}

src/test/java/org/cmh/backend/TestcontainersConfiguration.java

@@ -1,25 +0,0 @@
-package org.cmh.backend;
-
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
-import org.springframework.context.annotation.Bean;
-import org.testcontainers.containers.MariaDBContainer;
-import org.testcontainers.containers.MySQLContainer;
-import org.testcontainers.utility.DockerImageName;
-
-@TestConfiguration(proxyBeanMethods = false)
-class TestcontainersConfiguration {
-
-	@Bean
-	@ServiceConnection
-	MariaDBContainer<?> mariaDbContainer() {
-		return new MariaDBContainer<>(DockerImageName.parse("mariadb:latest"));
-	}
-
-	@Bean
-	@ServiceConnection
-	MySQLContainer<?> mysqlContainer() {
-		return new MySQLContainer<>(DockerImageName.parse("mysql:latest"));
-	}
-
-}

src/test/java/org/cmh/backend/Utils/JwtVerifyAspectTest.java

@@ -1,88 +0,0 @@
-package org.cmh.backend.Utils;
-
-import org.cmh.backend.authentication.service.UserService;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mockito;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-public class JwtVerifyAspectTest {
-
-    @Configuration
-    @EnableAspectJAutoProxy
-    @Import({JwtVerifyAspect.class})
-    static class Config {
-        @Bean
-        public JwtUtil jwtUtil() {
-            return Mockito.mock(JwtUtil.class);
-        }
-
-        @Bean
-        public UserService userService() {
-            return Mockito.mock(UserService.class);
-        }
-    }
-
-    private JwtUtil jwtUtil = new JwtUtil();
-
-    @InjectMocks
-    private JwtVerifyAspect jwtVerifyAspect;
-
-    @BeforeClass
-    public static void setUpClass() {
-        // Static setup if needed
-    }
-
-    @Before
-    public void setUp() {
-        Mockito.when(jwtUtil.isTokenValid("validToken")).thenReturn(true);
-        Mockito.when(jwtUtil.isTokenValid("invalidToken")).thenReturn(false);
-    }
-
-    // TODO:这个测试跑不动，有问题，先取消掉
-//    @Test
-//    public void testVerify() {
-//        SomeController validTokenController = new SomeController("validToken");
-//        SomeController invalidTokenController = new SomeController("invalidToken");
-//
-//        Assert.assertTrue("Valid token should pass verification", validTokenController.run());
-//        Assert.assertFalse("Invalid token should fail verification", invalidTokenController.run());
-//    }
-}
-
-class SomeController {
-    private SomeJwtRequest request;
-
-    SomeController(String token) {
-        this.request = new SomeJwtRequest(token, "test");
-    }
-
-    public boolean run() {
-        try {
-            return verify(request);
-        } catch (JwtValidationException e) {
-            return false;
-        }
-    }
-
-    @JwtVerify
-    public boolean verify(SomeJwtRequest request) {
-        return true;
-    }
-}
-
-class SomeJwtRequest extends JwtRequest {
-    String msg;
-
-    public SomeJwtRequest(String token, String msg) {
-        super.setToken(token);
-        this.msg = msg;
-    }
-}