修复了部分bug

lisy

2023-06-14 dce6ffdc52bbba0c28d761fcd1c5659840f0bba9

修复了部分bug

 cloud-server-account/pom.xml

@@ -106,11 +106,6 @@
            <version>2.3.30</version>
        </dependency>

        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-jpa</artifactId>
            <version>1.11.4.RELEASE</version>
        </dependency>

    </dependencies>


 cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/controller/ClassDetailsController.java
@@ -1,16 +1,15 @@
package com.dsh.app.controller;
package com.dsh.account.controller;


import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.dsh.account.model.vo.classDetails.classInsVo.StuDetailsReq;
import com.dsh.account.util.DateUtil;
import com.dsh.app.entity.TStudent;
import com.dsh.app.model.vo.classDetails.classInsVo.ClassInfoVo;
import com.dsh.app.model.vo.classDetails.classInsVo.StuDetailsReq;
import com.dsh.app.model.vo.classDetails.classInsVo.StuListVo;
import com.dsh.app.model.vo.classDetails.classInsVo.StuPhysicalVo;
import com.dsh.app.service.TAppUserService;
import com.dsh.app.service.TStudentService;
import com.dsh.account.entity.TStudent;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
import com.dsh.account.model.vo.classDetails.classInsVo.StuListVo;
import com.dsh.account.model.vo.classDetails.classInsVo.StuPhysicalVo;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.service.TStudentService;
import io.swagger.annotations.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

 cloud-server-account/src/main/java/com/dsh/account/entity/TAppUser.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/entity/TAppUser.java
@@ -1,15 +1,11 @@
package com.dsh.app.entity;
package com.dsh.account.entity;

import com.baomidou.mybatisplus.enums.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;

import com.baomidou.mybatisplus.annotations.Version;

import lombok.Data;
import lombok.EqualsAndHashCode;

 cloud-server-account/src/main/java/com/dsh/account/entity/TStudent.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/entity/TStudent.java
@@ -1,4 +1,4 @@
package com.dsh.app.entity;
package com.dsh.account.entity;

import com.baomidou.mybatisplus.enums.IdType;
import java.util.Date;

 cloud-server-account/src/main/java/com/dsh/account/feignclient/other/ImgConfigClient.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/feignclient/other/ImgConfigClient.java
@@ -1,6 +1,6 @@
package com.dsh.app.feignclient.other;
package com.dsh.account.feignclient.other;

import com.dsh.app.feignclient.other.model.TImgConfig;
import com.dsh.account.feignclient.other.model.TImgConfig;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;


 cloud-server-account/src/main/java/com/dsh/account/feignclient/other/model/TImgConfig.java

copy from cloud-server-account/src/main/java/com/dsh/app/feignclient/other/model/TImgConfig.java
copy to cloud-server-account/src/main/java/com/dsh/account/feignclient/other/model/TImgConfig.java
File was copied from cloud-server-account/src/main/java/com/dsh/app/feignclient/other/model/TImgConfig.java
@@ -1,12 +1,10 @@
package com.dsh.app.feignclient.other.model;
package com.dsh.account.feignclient.other.model;

import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

import java.io.Serializable;


 cloud-server-account/src/main/java/com/dsh/account/mapper/TAppUserMapper.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/mapper/TAppUserMapper.java
@@ -1,6 +1,6 @@
package com.dsh.app.mapper;
package com.dsh.account.mapper;

import com.dsh.app.entity.TAppUser;
import com.dsh.account.entity.TAppUser;
import com.baomidou.mybatisplus.mapper.BaseMapper;

/**

 cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/mapper/TStudentMapper.java
@@ -1,6 +1,6 @@
package com.dsh.app.mapper;
package com.dsh.account.mapper;

import com.dsh.app.entity.TStudent;
import com.dsh.account.entity.TStudent;
import com.baomidou.mybatisplus.mapper.BaseMapper;

/**

 cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/CourseVenue.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/CourseVenue.java
@@ -1,4 +1,4 @@
package com.dsh.app.model.vo.classDetails;
package com.dsh.account.model.vo.classDetails;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/ExerciseVideo.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/ExerciseVideo.java
@@ -1,4 +1,4 @@
package com.dsh.app.model.vo.classDetails;
package com.dsh.account.model.vo.classDetails;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/RegisteredCourse.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/RegisteredCourse.java
@@ -1,4 +1,4 @@
package com.dsh.app.model.vo.classDetails;
package com.dsh.account.model.vo.classDetails;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/WeekedCourse.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/WeekedCourse.java
@@ -1,4 +1,4 @@
package com.dsh.app.model.vo.classDetails;
package com.dsh.account.model.vo.classDetails;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/ClassInfoVo.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/ClassInfoVo.java
@@ -1,9 +1,9 @@
package com.dsh.app.model.vo.classDetails.classInsVo;
package com.dsh.account.model.vo.classDetails.classInsVo;


import com.dsh.app.model.vo.classDetails.ExerciseVideo;
import com.dsh.app.model.vo.classDetails.RegisteredCourse;
import com.dsh.app.model.vo.classDetails.WeekedCourse;
import com.dsh.account.model.vo.classDetails.ExerciseVideo;
import com.dsh.account.model.vo.classDetails.RegisteredCourse;
import com.dsh.account.model.vo.classDetails.WeekedCourse;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;


 cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuDetailsReq.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/StuDetailsReq.java
@@ -1,4 +1,4 @@
package com.dsh.app.model.vo.classDetails.classInsVo;
package com.dsh.account.model.vo.classDetails.classInsVo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuListVo.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/StuListVo.java
@@ -1,4 +1,4 @@
package com.dsh.app.model.vo.classDetails.classInsVo;
package com.dsh.account.model.vo.classDetails.classInsVo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuPhysicalVo.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/StuPhysicalVo.java
@@ -1,4 +1,4 @@
package com.dsh.app.model.vo.classDetails.classInsVo;
package com.dsh.account.model.vo.classDetails.classInsVo;


import lombok.Data;

 cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/service/TAppUserService.java
@@ -1,8 +1,8 @@
package com.dsh.app.service;
package com.dsh.account.service;

import com.dsh.app.entity.TAppUser;
import com.dsh.account.entity.TAppUser;
import com.baomidou.mybatisplus.service.IService;
import com.dsh.app.model.vo.classDetails.classInsVo.ClassInfoVo;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;

/**
 * <p>

 cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/service/TStudentService.java
@@ -1,6 +1,6 @@
package com.dsh.app.service;
package com.dsh.account.service;

import com.dsh.app.entity.TStudent;
import com.dsh.account.entity.TStudent;
import com.baomidou.mybatisplus.service.IService;

/**

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/service/impl/TAppUserServiceImpl.java
@@ -1,19 +1,20 @@
package com.dsh.app.service.impl;
package com.dsh.account.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.dsh.app.entity.TAppUser;
import com.dsh.app.entity.TStudent;
import com.dsh.app.feignclient.other.ImgConfigClient;
import com.dsh.app.feignclient.other.model.TImgConfig;
import com.dsh.app.mapper.TAppUserMapper;
import com.dsh.app.mapper.TStudentMapper;
import com.dsh.app.model.vo.classDetails.classInsVo.ClassInfoVo;
import com.dsh.app.service.TAppUserService;
import com.dsh.account.mapper.TStudentMapper;
import com.dsh.account.feignclient.other.ImgConfigClient;
import com.dsh.account.feignclient.other.model.TImgConfig;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.entity.TAppUser;
import com.dsh.account.entity.TStudent;
import com.dsh.account.mapper.TAppUserMapper;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.dsh.account.util.ToolUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
@@ -30,7 +31,7 @@
    @Autowired
    private TStudentMapper tsmapper;

    @Autowired
    @Resource
    private ImgConfigClient configClient;

    @Override

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/service/impl/TStudentServiceImpl.java
@@ -1,8 +1,8 @@
package com.dsh.app.service.impl;
package com.dsh.account.service.impl;

import com.dsh.app.entity.TStudent;
import com.dsh.app.mapper.TStudentMapper;
import com.dsh.app.service.TStudentService;
import com.dsh.account.entity.TStudent;
import com.dsh.account.mapper.TStudentMapper;
import com.dsh.account.service.TStudentService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;


 cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml

@@ -1,9 +1,9 @@
<?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.dsh.app.mapper.TAppUserMapper">
<mapper namespace="com.dsh.account.mapper.TAppUserMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.dsh.app.entity.TAppUser">
    <resultMap id="BaseResultMap" type="com.dsh.account.entity.TAppUser">
        <id column="id" property="id" />
        <result column="code" property="code" />
        <result column="name" property="name" />

 cloud-server-account/src/main/resources/mapper/TStudentMapper.xml

@@ -1,9 +1,9 @@
<?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.dsh.app.mapper.TStudentMapper">
<mapper namespace="com.dsh.account.mapper.TStudentMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.dsh.app.entity.TStudent">
    <resultMap id="BaseResultMap" type="com.dsh.account.entity.TStudent">
        <id column="id" property="id" />
        <result column="appUserId" property="appUserId" />
        <result column="name" property="name" />

 cloud-server-course/pom.xml

@@ -82,13 +82,6 @@
            <version>2.3.30</version>
        </dependency>

        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-jpa</artifactId>
            <version>1.11.4.RELEASE</version>
        </dependency>


        <dependency>    <!--swagger2-->
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>

 cloud-server-other/pom.xml

@@ -107,11 +107,6 @@
            <version>2.3.30</version>
        </dependency>

        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-jpa</artifactId>
            <version>1.11.4.RELEASE</version>
        </dependency>

    </dependencies>


 cloud-server-other/src/main/java/com/dsh/app/entity/TImgConfig.java

File was deleted

 cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java

File was renamed from cloud-server-other/src/main/java/com/dsh/app/controller/ImgConfigController.java
@@ -1,17 +1,11 @@
package com.dsh.app.controller;
package com.dsh.other.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.dsh.app.entity.TImgConfig;
import com.dsh.app.service.TImgConfigService;
import com.dsh.other.util.ResultUtil;
import com.dsh.other.entity.TImgConfig;
import com.dsh.other.service.TImgConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;


 cloud-server-other/src/main/java/com/dsh/other/entity/TImgConfig.java

File was renamed from cloud-server-account/src/main/java/com/dsh/app/feignclient/other/model/TImgConfig.java
@@ -1,14 +1,14 @@
package com.dsh.app.feignclient.other.model;
package com.dsh.other.entity;

import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

import java.io.Serializable;

/**
 * <p>
@@ -16,10 +16,12 @@
 * </p>
 *
 * @author administrator
 * @since 2023-06-13
 * @since 2023-06-14
 */
@EqualsAndHashCode(callSuper = true)
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_img_config")
public class TImgConfig extends Model<TImgConfig> {

    private static final long serialVersionUID = 1L;

 cloud-server-other/src/main/java/com/dsh/other/feignclient/ImgConfigClient.java

File was renamed from cloud-server-other/src/main/java/com/dsh/app/feignclient/ImgConfigClient.java
@@ -1,6 +1,6 @@
package com.dsh.app.feignclient;
package com.dsh.other.feignclient;

import com.dsh.app.entity.TImgConfig;
import com.dsh.other.entity.TImgConfig;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;


 cloud-server-other/src/main/java/com/dsh/other/mapper/TImgConfigMapper.java

File was renamed from cloud-server-other/src/main/java/com/dsh/app/mapper/TImgConfigMapper.java
@@ -1,6 +1,6 @@
package com.dsh.app.mapper;
package com.dsh.other.mapper;

import com.dsh.app.entity.TImgConfig;
import com.dsh.other.entity.TImgConfig;
import com.baomidou.mybatisplus.mapper.BaseMapper;

/**

 cloud-server-other/src/main/java/com/dsh/other/service/TImgConfigService.java

File was renamed from cloud-server-other/src/main/java/com/dsh/app/service/TImgConfigService.java
@@ -1,6 +1,6 @@
package com.dsh.app.service;
package com.dsh.other.service;

import com.dsh.app.entity.TImgConfig;
import com.dsh.other.entity.TImgConfig;
import com.baomidou.mybatisplus.service.IService;

/**

 cloud-server-other/src/main/java/com/dsh/other/service/impl/TImgConfigServiceImpl.java

File was renamed from cloud-server-other/src/main/java/com/dsh/app/service/impl/TImgConfigServiceImpl.java
@@ -1,8 +1,8 @@
package com.dsh.app.service.impl;
package com.dsh.other.service.impl;

import com.dsh.app.entity.TImgConfig;
import com.dsh.app.mapper.TImgConfigMapper;
import com.dsh.app.service.TImgConfigService;
import com.dsh.other.entity.TImgConfig;
import com.dsh.other.mapper.TImgConfigMapper;
import com.dsh.other.service.TImgConfigService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;


 cloud-server-other/src/main/resources/mapper/TImgConfigMapper.xml

@@ -1,9 +1,9 @@
<?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.dsh.app.mapper.TImgConfigMapper">
<mapper namespace="com.dsh.other.mapper.TImgConfigMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.dsh.app.entity.TImgConfig">
    <resultMap id="BaseResultMap" type="com.dsh.other.entity.TImgConfig">
        <id column="id" property="id" />
        <result column="position" property="position" />
        <result column="content" property="content" />