Merge pull request 'Quella' (#3) from Quella into main

Reviewed-on: #3

ietmwebbackend/src/main/java/com/backend/webbackend/Controller/CourseController.java

@@ -2,10 +2,11 @@ package com.backend.webbackend.Controller;
 
 import com.backend.webbackend.Service.courseService;
 import com.backend.webbackend.Vo.ResultVo;
+import com.backend.webbackend.domain.Course;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 @RestController
 @RequestMapping("course")
@@ -13,6 +14,9 @@ public class CourseController {
     @Autowired
    private courseService courseService;
 
+    @Value("${app.courseLoadPath}")
+    private String courseLoadPath;
+
     // 返回课程信息
     @GetMapping("getAll")
     public ResultVo getAllCourses() {
@@ -25,7 +29,29 @@ public class CourseController {
         return ResultVo.Success("", courseService.getCourseResources());
     }
 
-    //用户上传课程资源
+    //返回课程类型信息
+    @GetMapping("getCourseTypes")
+    public ResultVo getAllCourseTypes() {
+        return ResultVo.Success("", courseService.getAllCourseTypes());
+    }
 
+    //新增课程信息
+    @PostMapping(value = "addCourse", consumes = "multipart/form-data")
+    public ResultVo addCourse(@ModelAttribute Course course, @RequestPart(name = "icoFile",required = false)MultipartFile icoFile) {
+        try {
+            if(courseService.addCourse(course,icoFile)>0)
+            return ResultVo.Success("", "新增课程信息成功");
+            else
+                return ResultVo.Error("", "新增课程信息失败");
+        } catch (Exception e) {
+            throw new RuntimeException("新增课程信息失败!!!!!!");
+        }
+    }
 
+    //新增课程资源
+    @PostMapping("addCourseResource")
+    public ResultVo addCourseResource() {
+
+        return ResultVo.Success("", "新增课程资源成功");
+    }
 }

ietmwebbackend/src/main/java/com/backend/webbackend/Controller/userController.java

@@ -23,6 +23,13 @@ public class userController {
         return ResultVo.Success("",userService.getAlldept());
     }
 
+    //返回全部用户信息
+    @GetMapping("allUsers")
+    public ResultVo getAllUsers(){
+        return ResultVo.Success("",userService.getAllUsers());
+    }
+
+
     //用户注册
     @PostMapping("register")
     public ResultVo register(@RequestBody User user){
@@ -35,8 +42,8 @@ public class userController {
     }
 
     //用户登录
-    @PostMapping("login")
-    public ResultVo login(@RequestBody User user) {
+    @PostMapping(value = "login")
+    public ResultVo login(@ModelAttribute User user) {
         if(!userService.login(user.getUsername(),user.getPassword())){
             return ResultVo.Error("","用户名或密码错误");
         }
@@ -54,8 +61,18 @@ public class userController {
             return ResultVo.Success("","用户信息修改成功");
         }
         catch (Exception e){
+            System.out.println(e.getMessage());
            throw new RuntimeException("用户信息修改失败!!!!!!");
         }
-
     }
+
+    @GetMapping("deleteUser")
+    public ResultVo deleteTest(@Param("id") Long id) {
+        if(userService.deleteUserById(id) == 1){
+            return ResultVo.Success("", "用户删除成功");
+        }else {
+            return ResultVo.Error("", "用户删除失败");
+        }
+    }
+
 }

ietmwebbackend/src/main/java/com/backend/webbackend/Service/Impl/courseServiceImpl.java

@@ -1,20 +1,25 @@
 package com.backend.webbackend.Service.Impl;
 
 import com.backend.webbackend.domain.Course;
+import com.backend.webbackend.domain.CourseType;
 import com.backend.webbackend.domain.TrainingResource;
 import com.backend.webbackend.mapper.CourseMapper;
+import com.backend.webbackend.mapper.CourseTypeMapper;
 import com.backend.webbackend.mapper.TrainingResourceMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
 @Service
 public class courseServiceImpl implements com.backend.webbackend.Service.courseService {
     @Autowired
-    CourseMapper courseMapper;
+    CourseMapper courseMapper;  //用户管理信息
     @Autowired
-    TrainingResourceMapper trainingResourceMapper;
+    CourseTypeMapper courseTypeMapper; //用于管理课程类型
+    @Autowired
+    TrainingResourceMapper trainingResourceMapper;  //用于管理课程资源文件
 
     // 返回课程信息
     @Override
@@ -27,4 +32,17 @@ public class courseServiceImpl implements com.backend.webbackend.Service.courseS
     public List<TrainingResource> getCourseResources(){
         return trainingResourceMapper.getAllTraningResources();
     }
+
+    //返回课程类型信息
+    @Override
+    public List<CourseType> getAllCourseTypes() {
+        return courseTypeMapper.selectAllCourseTypes();
+    }
+
+    //新增课程信息
+    @Override
+    public int addCourse(Course course, MultipartFile icoFile) {
+        //如果有上传文件,先保存文件至服务器磁盘
+        return courseMapper.insertCourse(course);
+    }
 }

ietmwebbackend/src/main/java/com/backend/webbackend/Service/Impl/userServiceImpl.java

@@ -83,4 +83,16 @@ public class userServiceImpl implements userService {
     public int updateUserInfo(User user){
         return userMapper.updateByName(user);
     }
+
+    //返回全部用户信息
+    @Override
+    public List<User> getAllUsers() {
+        return userMapper.getAllUsers();
+    }
+
+    //删除用户
+    @Override
+    public int deleteUserById(Long id) {
+        return userMapper.deleteByPrimaryKey(id);
+    }
 }

ietmwebbackend/src/main/java/com/backend/webbackend/Service/courseService.java

@@ -1,8 +1,10 @@
 package com.backend.webbackend.Service;
 
 import com.backend.webbackend.domain.Course;
+import com.backend.webbackend.domain.CourseType;
 import com.backend.webbackend.domain.TrainingResource;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -10,4 +12,6 @@ import java.util.List;
 public interface courseService {
     List<Course> getAllCourseInfo();
     List<TrainingResource> getCourseResources();
+    List<CourseType>getAllCourseTypes();
+    int addCourse(Course course, MultipartFile icoFile);
 }

ietmwebbackend/src/main/java/com/backend/webbackend/Service/userService.java

@@ -14,4 +14,8 @@ public interface userService {
     boolean login(String username, String password);
     List<Dept> getAlldept();
     int updateUserInfo(User user);
+
+    List<User> getAllUsers();
+
+    int deleteUserById(Long id);
 }

ietmwebbackend/src/main/java/com/backend/webbackend/Tools/Tools.java

@@ -3,6 +3,7 @@ import com.backend.webbackend.mapper.UserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.regex.Pattern;
 
@@ -49,4 +50,10 @@ public class Tools {
         }
         return PASSWORD_ENCODER.matches(rawPassword, encodedPassword);
     }
+
+    //文件保存
+    public String saveIcoFile(MultipartFile icoFile){
+
+        return "";
+    }
 }

ietmwebbackend/src/main/java/com/backend/webbackend/domain/Course.java

@@ -10,12 +10,16 @@ import lombok.Data;
 public class Course {
     private Long id;
 
+    @JsonProperty("course_name")
     private String courseName;
 
+    @JsonProperty("course_code")
     private String courseCode;
 
+    @JsonProperty("course_desc")
     private String courseDesc;
 
+    @JsonProperty("course_category")
     private String courseCategory;
 
     @JsonProperty("course_ico")

ietmwebbackend/src/main/java/com/backend/webbackend/mapper/CourseMapper.java

@@ -26,4 +26,5 @@ public interface CourseMapper {
 
     int updateByPrimaryKey(Course record);
 
+    int insertCourse(Course course);
 }

ietmwebbackend/src/main/java/com/backend/webbackend/mapper/CourseTypeMapper.java

@@ -2,6 +2,8 @@ package com.backend.webbackend.mapper;
 
 import com.backend.webbackend.domain.CourseType;
 
+import java.util.List;
+
 /**
 * @author Quella
 * @description 针对表【course_type】的数据库操作Mapper
@@ -18,6 +20,8 @@ public interface CourseTypeMapper {
 
     CourseType selectByPrimaryKey(Long id);
 
+    List<CourseType> selectAllCourseTypes();
+
     int updateByPrimaryKeySelective(CourseType record);
 
     int updateByPrimaryKey(CourseType record);

ietmwebbackend/src/main/java/com/backend/webbackend/mapper/UserMapper.java

@@ -3,6 +3,8 @@ package com.backend.webbackend.mapper;
 import com.backend.webbackend.domain.User;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
 * @author Quella
 * @description 针对表【user(用户表)】的数据库操作Mapper
@@ -30,4 +32,6 @@ public interface UserMapper {
     int updateById(User user);
 
     int updateByName(User user);
+
+    List<User> getAllUsers();
 }

ietmwebbackend/src/main/resources/application.yml

@@ -16,3 +16,7 @@ mybatis:
 #      backend:
 #        webbackend:
 #          mapper: debug
+
+
+app:
+  courseLoadPath: D:\\JavaWebProjects\\src\\ico

ietmwebbackend/src/main/resources/mapper/CourseMapper.xml

@@ -40,6 +40,7 @@
         ( id,course_name,course_code,course_desc,course_category)
         values (#{id},#{courseName},#{courseCode},#{courseDesc},#{courseCategory})
     </insert>
+
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.backend.webbackend.domain.Course" useGeneratedKeys="true">
         insert into course
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -58,6 +59,24 @@
         </trim>
     </insert>
 
+    <insert id="insertCourse" parameterType="com.backend.webbackend.domain.Course" keyColumn="id" keyProperty="id" useGeneratedKeys="true">
+        insert into course
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="courseName != null and courseName != ''">course_name,</if>
+            <if test="courseCode != null and courseCode != ''">course_code,</if>
+            <if test="courseDesc != null and courseDesc != ''">course_desc,</if>
+            <if test="courseCategory != null and courseCategory != ''">course_category,</if>
+            <if test="courseIco != null and courseIco != ''">course_ico,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="courseName != null and courseName != ''">#{courseName},</if>
+            <if test="courseCode != null and courseCode != ''">#{courseCode},</if>
+            <if test="courseDesc != null and courseDesc != ''">#{courseDesc},</if>
+            <if test="courseCategory != null and courseCategory != ''">#{courseCategory},</if>
+            <if test="courseIco != null and courseIco != ''">#{courseIco},</if>
+        </trim>
+    </insert>
+
     <update id="updateByPrimaryKeySelective" parameterType="com.backend.webbackend.domain.Course">
         update course
         <set>

ietmwebbackend/src/main/resources/mapper/CourseTypeMapper.xml

@@ -19,6 +19,11 @@
         from course_type
         where  id = #{id} 
     </select>
+    <select id="selectAllCourseTypes" resultType="com.backend.webbackend.domain.CourseType">
+        select
+        <include refid="Base_Column_List" />
+        from course_type
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from course_type

ietmwebbackend/src/main/resources/mapper/UserMapper.xml

@@ -37,10 +37,14 @@
         from user
         where username = #{username}
     </select>
+    <select id="getAllUsers" resultType="com.backend.webbackend.domain.User">
+        select
+        <include refid="Base_Column_List" />
+        from user
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-        delete from user
-        where  id = #{id} 
+        update user set status = 0 where id = #{id}
     </delete>
 
     <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.backend.webbackend.domain.User" useGeneratedKeys="true">