diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java index 414dad03..9873d219 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java @@ -1,8 +1,8 @@ package com.ibeetl.jlw.dao; -import com.ibeetl.jlw.entity.RandomStudentListDTO; import com.ibeetl.jlw.entity.Student; import com.ibeetl.jlw.entity.TeacherOpenCourseMergeStudent; +import com.ibeetl.jlw.entity.dto.RandomStudentListDTO; import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeStudentQuery; import com.sun.istack.internal.NotNull; import org.beetl.sql.core.engine.PageQuery; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/RandomStudentListDTO.java b/web/src/main/java/com/ibeetl/jlw/entity/dto/RandomStudentListDTO.java similarity index 95% rename from web/src/main/java/com/ibeetl/jlw/entity/RandomStudentListDTO.java rename to web/src/main/java/com/ibeetl/jlw/entity/dto/RandomStudentListDTO.java index 36a1e3fc..7f038ec9 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/RandomStudentListDTO.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/dto/RandomStudentListDTO.java @@ -1,4 +1,4 @@ -package com.ibeetl.jlw.entity; +package com.ibeetl.jlw.entity.dto; import lombok.Data; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninLogManualDTO.java b/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherOpenCourseStudentSigninLogManualDTO.java similarity index 95% rename from web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninLogManualDTO.java rename to web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherOpenCourseStudentSigninLogManualDTO.java index 986c3478..cc9038a1 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninLogManualDTO.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherOpenCourseStudentSigninLogManualDTO.java @@ -1,4 +1,4 @@ -package com.ibeetl.jlw.entity; +package com.ibeetl.jlw.entity.dto; import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninLogQuery; import lombok.Data; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninLogManualMergeDTO.java b/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherOpenCourseStudentSigninLogManualMergeDTO.java similarity index 94% rename from web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninLogManualMergeDTO.java rename to web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherOpenCourseStudentSigninLogManualMergeDTO.java index 5602e3c9..51b50356 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninLogManualMergeDTO.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherOpenCourseStudentSigninLogManualMergeDTO.java @@ -1,4 +1,4 @@ -package com.ibeetl.jlw.entity; +package com.ibeetl.jlw.entity.dto; import lombok.Data; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSettingManualDTO.java b/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherOpenCourseStudentSigninSettingManualDTO.java similarity index 93% rename from web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSettingManualDTO.java rename to web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherOpenCourseStudentSigninSettingManualDTO.java index f6512708..5f6fef70 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSettingManualDTO.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherOpenCourseStudentSigninSettingManualDTO.java @@ -1,4 +1,4 @@ -package com.ibeetl.jlw.entity; +package com.ibeetl.jlw.entity.dto; import lombok.Data; import org.springframework.validation.annotation.Validated; diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java index 317dbae9..36c329aa 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java @@ -13,6 +13,7 @@ import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonReturnCode; import com.ibeetl.jlw.dao.*; import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.dto.RandomStudentListDTO; import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeStudentQuery; import org.apache.commons.lang3.StringUtils; import org.beetl.sql.core.SqlId; diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java index 67bafc37..b8752a8f 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java @@ -23,8 +23,10 @@ import com.ibeetl.jlw.dao.TeacherOpenCourseMergeSchoolClassDao; import com.ibeetl.jlw.dao.TeacherOpenCourseStudentSigninLogDao; import com.ibeetl.jlw.dao.TeacherOpenCourseStudentSigninSettingDao; import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogManualMergeDTO; import com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogSigninDTO; import com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogSigninDTO.ManualClass; +import com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninSettingManualDTO; import com.ibeetl.jlw.enums.StartStatusEnum; import com.ibeetl.jlw.validator.TeacherOpenCourseStudentSigninLogSigninDTOValidator; import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninLogQuery; diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java index 3d116b27..eeb09098 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java @@ -8,9 +8,9 @@ import com.ibeetl.admin.core.annotation.Function; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.file.FileService; import com.ibeetl.admin.core.web.JsonResult; -import com.ibeetl.jlw.entity.RandomStudentListDTO; import com.ibeetl.jlw.entity.Student; import com.ibeetl.jlw.entity.TeacherOpenCourseMergeStudent; +import com.ibeetl.jlw.entity.dto.RandomStudentListDTO; import com.ibeetl.jlw.service.TeacherOpenCourseMergeStudentService; import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeStudentQuery; import org.apache.commons.lang3.StringUtils; diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java index 6b31ee7c..a7ac9644 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java @@ -12,7 +12,7 @@ import com.ibeetl.admin.core.util.TimeTool; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.jlw.entity.FileEntity; import com.ibeetl.jlw.entity.TeacherOpenCourseStudentSigninLog; -import com.ibeetl.jlw.entity.TeacherOpenCourseStudentSigninLogManualMergeDTO; +import com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogManualMergeDTO; import com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogSigninDTO; import com.ibeetl.jlw.service.TeacherOpenCourseStudentSigninLogService; import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninLogQuery; diff --git a/web/tianzePro_B_Restart.sh b/web/tianzePro_B_Restart.sh new file mode 100644 index 00000000..d1d37a11 --- /dev/null +++ b/web/tianzePro_B_Restart.sh @@ -0,0 +1,11 @@ +#! /bin/bash +HOME_PATH=/data/dev +LOG_PATH=/data/logs + +rm -rf ${HOME_PATH}/web-1.0.jar +mkdir -p ${HOME_PATH} +tar zxvf /home/admin/java/group-package.tgz -C ${HOME_PATH} + +ps -ef | grep java | grep yt-group-service | grep -v grep | awk '{print$2}' | xargs kill -9 + +nohup java -Xms256m -Xmx512m -jar ${HOME_PATH}/web/target/web-1.0.jar > ${LOG_PATH}/tianze-pro.log 2>&1&