添加课程

XiaoETech-admin/pom.xml

@@ -65,19 +65,6 @@
             <groupId>com.zhentao</groupId>
             <artifactId>zhentao-generator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>5.3.39</version>
-        </dependency>
 
     </dependencies>
 

XiaoETech-admin/src/main/java/com/zhentao/web/controller/system/CourseController.java

@@ -0,0 +1,37 @@
+package com.zhentao.web.controller.system;
+
+import com.zhentao.common.annotation.Anonymous;
+import com.zhentao.common.core.controller.BaseController;
+import com.zhentao.common.core.domain.entity.Course;
+import com.zhentao.common.core.page.TableDataInfo;
+import com.zhentao.system.service.CourseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author: wzy
+ * @date: 2025/5/8 16:14
+ */
+@RestController
+@RequestMapping("/system/course")
+public class CourseController extends BaseController {
+    @Autowired
+    private CourseService courseService;
+
+    /**
+     * 课程列表查询
+     * @param course
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('course:list')")
+//    @Anonymous
+    @GetMapping("/list")
+    public TableDataInfo list(Course course){
+        startPage();
+        List<Course> courseList = courseService.selectCourseList(course);
+        return getDataTable(courseList);
+    }
+}

XiaoETech-admin/src/main/java/com/zhentao/web/controller/system/SysLoginController.java

@@ -41,7 +41,8 @@ import java.util.Set;
  */
 
 @RestController
-public class SysLoginController {
+public class SysLoginController
+{
 
     @Autowired
     private SysLoginService loginService;
@@ -62,9 +63,8 @@ public class SysLoginController {
     private WxAppConfig wxAppConfig;
 
     private static final Logger logger = LoggerFactory.getLogger(SysLoginController.class);
-
     @PostMapping("/wxLogin")
-    public AjaxResult wxLogin(@RequestBody WxLoginBody wxLoginBody) {
+    public AjaxResult wxLogin(@RequestBody WxLoginBody wxLoginBody){
         logger.info("登录参数: " + JSON.toJSONString(wxLoginBody));
         // 获取登录凭证, 只能用一次
         String code = wxLoginBody.getCode();
@@ -90,20 +90,19 @@ public class SysLoginController {
             return AjaxResult.error("微信登录失败");
         }
 
-        if (StringUtils.hasText(decryptResult)) {
+        if(StringUtils.hasText(decryptResult)){
             // 如果解析成功, 获取token
             String token = loginService.wxLogin(decryptResult);
             AjaxResult ajax = AjaxResult.success();
             ajax.put(Constants.TOKEN, token);
             return ajax;
-        } else {
+        }else{
             return AjaxResult.error("微信登录失败");
         }
     }
 
     /**
      * AES解密
-     *
      * @param sessionKey
      * @param encryptedIv
      * @param encryptedData
@@ -117,7 +116,8 @@ public class SysLoginController {
         byte[] encData = Base64.decode(encryptedData);
         // 如果密钥不足16位, 那么久补足
         int base = 16;
-        if (key.length % base != 0) {
+        if (key.length % base != 0)
+        {
             int groups = key.length / base + (key.length % base != 0 ? 1 : 0);
             byte[] temp = new byte[groups * base];
             Arrays.fill(temp, (byte) 0);
@@ -126,7 +126,7 @@ public class SysLoginController {
         }
 
         // 如果初始向量不足16位, 也补足
-        if (iv.length % base != 0) {
+        if(iv.length % base != 0){
             int groups = iv.length / base + (iv.length % base != 0 ? 1 : 0);
             byte[] temp = new byte[groups * base];
             Arrays.fill(temp, (byte) 0);
@@ -158,7 +158,8 @@ public class SysLoginController {
      * @return 结果
      */
     @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody) {
+    public AjaxResult login(@RequestBody LoginBody loginBody)
+    {
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
@@ -173,7 +174,8 @@ public class SysLoginController {
      * @return 用户信息
      */
     @GetMapping("getInfo")
-    public AjaxResult getInfo() {
+    public AjaxResult getInfo()
+    {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         if (loginUser == null) {
             return AjaxResult.error("未获取到登录用户信息");
@@ -183,7 +185,8 @@ public class SysLoginController {
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
-        if (loginUser.getPermissions() != null && !loginUser.getPermissions().equals(permissions)) {
+        if (loginUser.getPermissions() != null && !loginUser.getPermissions().equals(permissions))
+        {
             loginUser.setPermissions(permissions);
             tokenService.refreshToken(loginUser);
         }
@@ -200,7 +203,8 @@ public class SysLoginController {
      * @return 路由信息
      */
     @GetMapping("getRouters")
-    public AjaxResult getRouters() {
+    public AjaxResult getRouters()
+    {
         Long userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));

XiaoETech-admin/src/main/java/com/zhentao/web/controller/system/SysRegisterController.java

@@ -1,15 +1,14 @@
 package com.zhentao.web.controller.system;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
 import com.zhentao.common.core.controller.BaseController;
 import com.zhentao.common.core.domain.AjaxResult;
 import com.zhentao.common.core.domain.model.RegisterBody;
-import com.zhentao.common.utils.StringUtils;
 import com.zhentao.framework.web.service.SysRegisterService;
 import com.zhentao.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 注册验证
@@ -17,7 +16,8 @@ import com.zhentao.system.service.ISysConfigService;
  * @author ruoyi
  */
 @RestController
-public class SysRegisterController extends BaseController {
+public class SysRegisterController extends BaseController
+{
     @Autowired
     private SysRegisterService registerService;
 
@@ -25,7 +25,8 @@ public class SysRegisterController extends BaseController {
     private ISysConfigService configService;
 
     @PostMapping("/register")
-    public AjaxResult register(@RequestBody RegisterBody user) {
+    public AjaxResult register(@RequestBody RegisterBody user)
+    {
         registerService.register(user);
         return AjaxResult.success("注册成功");
     }

XiaoETech-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/xiao?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://123.57.134.90:3306/xiao?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: root
+                password: Tingting520
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

XiaoETech-admin/src/main/resources/application.yml

@@ -21,7 +21,7 @@ server:
     # 应用的访问路径
     context-path: /
     session:
-      timeout: 30m  # 会话超时时间为30分钟
+      timeout: 30m
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8

XiaoETech-common/pom.xml

@@ -52,13 +52,13 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-  
+
         <!-- JSON工具类 -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        
+
         <!-- 阿里JSON解析器 -->
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>
@@ -118,7 +118,17 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+            <version>3.5.4</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
 
     </dependencies>
 
-</project>
+</project>

XiaoETech-common/src/main/java/com/zhentao/common/annotation/DataScope.java

@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 
 /**
  * 数据权限过滤注解
- * 
+ *
  * @author ruoyi
  */
 @Target(ElementType.METHOD)
@@ -22,6 +22,16 @@ public @interface DataScope
     public String deptAlias() default "";
 
     /**
+     *课程表的别名
+     */
+    public String courseAlias() default "";
+
+    /**
+     *课程类别的别名
+     */
+    public String categoryAlias() default "";
+
+    /**
      * 用户表的别名
      */
     public String userAlias() default "";

XiaoETech-common/src/main/java/com/zhentao/common/core/domain/model/LoginBody.java

@@ -2,10 +2,11 @@ package com.zhentao.common.core.domain.model;
 
 /**
  * 用户登录对象
- *
+ * 
  * @author ruoyi
  */
-public class LoginBody {
+public class LoginBody
+{
     /**
      * 用户名
      */
@@ -26,35 +27,43 @@ public class LoginBody {
      */
     private String uuid;
 
-    public String getUsername() {
+    public String getUsername()
+    {
         return username;
     }
 
-    public void setUsername(String username) {
+    public void setUsername(String username)
+    {
         this.username = username;
     }
 
-    public String getPassword() {
+    public String getPassword()
+    {
         return password;
     }
 
-    public void setPassword(String password) {
+    public void setPassword(String password)
+    {
         this.password = password;
     }
 
-    public String getCode() {
+    public String getCode()
+    {
         return code;
     }
 
-    public void setCode(String code) {
+    public void setCode(String code)
+    {
         this.code = code;
     }
 
-    public String getUuid() {
+    public String getUuid()
+    {
         return uuid;
     }
 
-    public void setUuid(String uuid) {
+    public void setUuid(String uuid)
+    {
         this.uuid = uuid;
     }
 }

XiaoETech-common/src/main/java/com/zhentao/common/core/domain/model/RegisterBody.java

@@ -2,9 +2,10 @@ package com.zhentao.common.core.domain.model;
 
 /**
  * 用户注册对象
- *
+ * 
  * @author ruoyi
  */
-public class RegisterBody extends LoginBody {
+public class RegisterBody extends LoginBody
+{
 
 }

XiaoETech-framework/src/main/java/com/zhentao/framework/config/SecurityConfig.java

@@ -114,7 +114,7 @@ public class SecurityConfig
                 requests.antMatchers("/login", "/wxLogin","/register", "/captchaImage").permitAll()
                     // 静态资源，可匿名访问
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
-                    .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+                    .antMatchers("/swagger-ui.html","/system/*", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
                     // 除上面外的所有请求全部需要鉴权认证
                     .anyRequest().authenticated();
             })

XiaoETech-framework/src/main/java/com/zhentao/framework/web/service/SysRegisterService.java

@@ -20,11 +20,12 @@ import com.zhentao.system.service.ISysUserService;
 
 /**
  * 注册校验方法
- *
+ * 
  * @author ruoyi
  */
 @Component
-public class SysRegisterService {
+public class SysRegisterService
+{
     @Autowired
     private ISysUserService userService;
 
@@ -37,36 +38,52 @@ public class SysRegisterService {
     /**
      * 注册
      */
-    public String register(RegisterBody registerBody) {
+    public String register(RegisterBody registerBody)
+    {
         String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword();
         SysUser sysUser = new SysUser();
         sysUser.setUserName(username);
 
         // 验证码开关
         boolean captchaEnabled = configService.selectCaptchaEnabled();
-        if (captchaEnabled) {
+        if (captchaEnabled)
+        {
             validateCaptcha(username, registerBody.getCode(), registerBody.getUuid());
         }
 
-        if (StringUtils.isEmpty(username)) {
+        if (StringUtils.isEmpty(username))
+        {
             msg = "用户名不能为空";
-        } else if (StringUtils.isEmpty(password)) {
+        }
+        else if (StringUtils.isEmpty(password))
+        {
             msg = "用户密码不能为空";
-        } else if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
+        }
+        else if (username.length() < UserConstants.USERNAME_MIN_LENGTH
+                || username.length() > UserConstants.USERNAME_MAX_LENGTH)
+        {
             msg = "账户长度必须在2到20个字符之间";
-        } else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
-                || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
+        }
+        else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
+                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
+        {
             msg = "密码长度必须在5到20个字符之间";
-        } else if (!userService.checkUserNameUnique(sysUser)) {
+        }
+        else if (!userService.checkUserNameUnique(sysUser))
+        {
             msg = "保存用户'" + username + "'失败，注册账号已存在";
-        } else {
+        }
+        else
+        {
             sysUser.setNickName(username);
             sysUser.setPassword(SecurityUtils.encryptPassword(password));
             boolean regFlag = userService.registerUser(sysUser);
-            if (!regFlag) {
+            if (!regFlag)
+            {
                 msg = "注册失败,请联系系统管理人员";
-            } else {
+            }
+            else
+            {
                 AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER, MessageUtils.message("user.register.success")));
             }
         }
@@ -75,20 +92,23 @@ public class SysRegisterService {
 
     /**
      * 校验验证码
-     *
+     * 
      * @param username 用户名
-     * @param code     验证码
-     * @param uuid     唯一标识
+     * @param code 验证码
+     * @param uuid 唯一标识
      * @return 结果
      */
-    public void validateCaptcha(String username, String code, String uuid) {
+    public void validateCaptcha(String username, String code, String uuid)
+    {
         String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
         String captcha = redisCache.getCacheObject(verifyKey);
         redisCache.deleteObject(verifyKey);
-        if (captcha == null) {
+        if (captcha == null)
+        {
             throw new CaptchaExpireException();
         }
-        if (!code.equalsIgnoreCase(captcha)) {
+        if (!code.equalsIgnoreCase(captcha))
+        {
             throw new CaptchaException();
         }
     }

XiaoETech-system/pom.xml

@@ -22,7 +22,12 @@
             <groupId>com.zhentao</groupId>
             <artifactId>zhentao-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-core</artifactId>
+            <version>3.5.4</version>
+        </dependency>
 
     </dependencies>
 
-</project>
+</project>

XiaoETech-system/src/main/java/com/zhentao/system/mapper/CourseMapper.java

@@ -0,0 +1,14 @@
+package com.zhentao.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhentao.common.core.domain.entity.Course;
+
+import java.util.List;
+
+/**
+ * @author: wzy
+ * @date: 2025/5/8 17:11
+ */
+public interface CourseMapper{
+    List<Course> selectCourseList(Course course);
+}

XiaoETech-system/src/main/java/com/zhentao/system/service/CourseService.java

@@ -0,0 +1,18 @@
+package com.zhentao.system.service;
+
+import com.zhentao.common.core.domain.entity.Course;
+
+import java.util.List;
+
+/**
+ * @author: wzy
+ * @date: 2025/5/8 17:04
+ */
+public interface CourseService {
+    /**
+     * 根据条件分页查询课程列表
+     * @param course
+     * @return
+     */
+    List<Course> selectCourseList(Course course);
+}

XiaoETech-system/src/main/java/com/zhentao/system/service/impl/CourseServiceImpl.java

@@ -0,0 +1,25 @@
+package com.zhentao.system.service.impl;
+
+import com.zhentao.common.annotation.DataScope;
+import com.zhentao.common.core.domain.entity.Course;
+import com.zhentao.system.mapper.CourseMapper;
+import com.zhentao.system.service.CourseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author: wzy
+ * @date: 2025/5/8 17:04
+ */
+@Service
+public class CourseServiceImpl implements CourseService {
+    @Autowired
+    private CourseMapper courseMapper;
+    @Override
+    @DataScope(courseAlias = "c",categoryAlias = "cat")
+    public List<Course> selectCourseList(Course course) {
+        return courseMapper.selectCourseList(course);
+    }
+}

XiaoETech-system/src/main/resources/mapper/system/CourseMapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.zhentao.system.mapper.CourseMapper">
+    <resultMap id="CourseResult" type="course">
+        <id property="courseId" column="course_id"/>
+        <result property="courseName" column="course_name"/>
+        <result property="courseDescription" column="course_description"/>
+        <result property="courseCategory" column="course_category"/>
+        <result property="instructorId" column="instructor_id"/>
+        <result property="courseCover" column="course_cover"/>
+        <result property="coursePrice" column="course_price"/>
+        <result property="courseDuration" column="course_duration"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="courseStatus" column="course_status"/>
+        <result property="studyNum" column="student_num"/>
+        <result property="isFree" column="is_free"/>
+        <result property="recommendIndex" column="recommend_index"/>
+        <result property="courseOutline" column="course_outline"/>
+        <association property="category" javaType="Category" resultMap="categoryResult"/>
+    </resultMap>
+    <resultMap id="categoryResult" type="Category">
+        <id property="categoryId" column="category_id"/>
+        <result property="categoryName" column="category_name"/>
+        <result property="categoryDescription" column="category_description"/>
+    </resultMap>
+    <select id="selectCourseList" resultType="com.zhentao.common.core.domain.entity.Course">
+        select c.*, cc.category_name, i.instructor_name from course c left join course_category cc on c.course_category = cc.category_id
+        left join instructor i on c.instructor_id = i.instructor_id
+        where c.course_status = '上线'
+        <if test="courseName != null and courseName != ''">
+            and c.course_name like concat('%', #{courseName}, '%')
+        </if>
+        <if test="courseCategory != null">
+            and c.course_category = #{courseCategory}
+        </if>
+    </select>
+</mapper>