1. 修改 院校动态授权码的刷新间隔时间;

2. 根据原型图增加相对应字段;
beetlsql3-dev
Mlxa0324 3 years ago
parent 39e0488dee
commit f6985f8ac5

@ -11,6 +11,8 @@ public class CoreDictType {
public static final String ROLE_TYPE="role_type"; public static final String ROLE_TYPE="role_type";
public static final String MENU_TYPE="menu_type"; public static final String MENU_TYPE="menu_type";
public static final String FUNCTION_TYPE="function_type"; public static final String FUNCTION_TYPE="function_type";
// 资源类型
public static final String RESOURCES_INFO_TYPE="resources_info_type";
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -28791,6 +28791,7 @@ CREATE TABLE `universities_colleges` (
`universities_colleges_contacts_email` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系人邮箱', `universities_colleges_contacts_email` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系人邮箱',
`universities_colleges_logo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '院校logo', `universities_colleges_logo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '院校logo',
`universities_colleges_status` int NULL DEFAULT NULL COMMENT '状态(1正常 2删除)', `universities_colleges_status` int NULL DEFAULT NULL COMMENT '状态(1正常 2删除)',
`universities_colleges_auth_code` int NULL DEFAULT NULL COMMENT '院校动态授权码',
`add_time` datetime NULL DEFAULT NULL COMMENT '添加时间', `add_time` datetime NULL DEFAULT NULL COMMENT '添加时间',
`org_id` bigint NULL DEFAULT NULL COMMENT '组织机构ID', `org_id` bigint NULL DEFAULT NULL COMMENT '组织机构ID',
`user_id` bigint NULL DEFAULT NULL COMMENT '后台用户ID', `user_id` bigint NULL DEFAULT NULL COMMENT '后台用户ID',

@ -22,5 +22,5 @@ public interface UniversitiesCollegesDao extends BaseMapper<UniversitiesColleges
public List<UniversitiesColleges> getValuesByQuery(UniversitiesCollegesQuery universitiesCollegesQuery); public List<UniversitiesColleges> getValuesByQuery(UniversitiesCollegesQuery universitiesCollegesQuery);
// 刷新院校的动态授权码 // 刷新院校的动态授权码
void refreshUniversitiesCollegesAuthCode(); Integer refreshUniversitiesCollegesAuthCode();
} }

@ -60,6 +60,9 @@ public class Student extends BaseEntity{
private String studentPassword ; private String studentPassword ;
// 微信信息
private String studentWeixinInfo;
//学生头像 //学生头像
private String headImg; private String headImg;
@ -235,4 +238,12 @@ public class Student extends BaseEntity{
public void setHeadImg(String headImg) { public void setHeadImg(String headImg) {
this.headImg = headImg; this.headImg = headImg;
} }
public String getStudentWeixinInfo() {
return studentWeixinInfo;
}
public void setStudentWeixinInfo(String studentWeixinInfo) {
this.studentWeixinInfo = studentWeixinInfo;
}
} }

@ -11,8 +11,8 @@ import javax.annotation.Resource;
/** /**
* *
* *
* 0 0 0/1 * * ? * 23:59
* * 0 59 23 L * ?
* @author lx * @author lx
*/ */
@Slf4j @Slf4j
@ -27,7 +27,8 @@ public class RefreshAuthCodeJob implements Job {
try { try {
if(workFinish){ if(workFinish){
workFinish = false; workFinish = false;
universitiesCollegesService.refreshUniversitiesCollegesAuthCode(); Integer upNum = universitiesCollegesService.refreshUniversitiesCollegesAuthCode();
log.info("刷新课程授权码成功, 共更新:【{}】 行数据", upNum);
workFinish = true; workFinish = true;
} }
}catch (Exception e){ }catch (Exception e){

@ -131,7 +131,7 @@ public class UniversitiesCollegesService extends CoreBaseService<UniversitiesCol
/** /**
* *
*/ */
public void refreshUniversitiesCollegesAuthCode() { public Integer refreshUniversitiesCollegesAuthCode() {
universitiesCollegesDao.refreshUniversitiesCollegesAuthCode(); return universitiesCollegesDao.refreshUniversitiesCollegesAuthCode();
} }
} }

@ -138,8 +138,8 @@ public class ApplicationRunnerController implements ApplicationRunner {
quartz.setJobGroup("刷新课程授权码"); quartz.setJobGroup("刷新课程授权码");
quartz.setJobClassName("com.ibeetl.jlw.job.RefreshAuthCodeJob"); quartz.setJobClassName("com.ibeetl.jlw.job.RefreshAuthCodeJob");
quartz.setDescription("计划任务启动RefreshAuthCodeJob"); quartz.setDescription("计划任务启动RefreshAuthCodeJob");
// 一小时刷新一次 // 每个月最后一天晚上23:59 执行任务
quartz.setCronExpression("0 0 0/1 * * ?"); quartz.setCronExpression("0 59 23 L * ?");
quartzService.save(quartz, null); quartzService.save(quartz, null);
} }

@ -1,5 +1,6 @@
package com.ibeetl.jlw.web.query; package com.ibeetl.jlw.web.query;
import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.jlw.entity.ResourcesInfo; import com.ibeetl.jlw.entity.ResourcesInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.annotation.Query;
@ -10,6 +11,9 @@ import com.ibeetl.admin.core.web.query.PageParam;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import static com.ibeetl.admin.core.annotation.Query.TYPE_DICT;
import static com.ibeetl.admin.core.util.enums.CoreDictType.RESOURCES_INFO_TYPE;
/** /**
*ResourcesInfo *ResourcesInfo
*/ */
@ -20,7 +24,7 @@ public class ResourcesInfoQuery extends PageParam {
private Long courseInfoId; private Long courseInfoId;
@Query(name = "资源名称", display = true) @Query(name = "资源名称", display = true)
private String resourcesInfoName ; private String resourcesInfoName ;
@Query(name = "资源类型(1视频 2课件 3附件)", display = false) @Query(name = "资源类型", type = TYPE_DICT, dict = RESOURCES_INFO_TYPE, display = true)
private Integer resourcesInfoType; private Integer resourcesInfoType;
@Query(name = "资源内容", display = false) @Query(name = "资源内容", display = false)
private String resourcesInfoContent; private String resourcesInfoContent;

@ -36,6 +36,9 @@ public class StudentQuery extends PageParam {
@Query(name = "后台用户ID", display = false) @Query(name = "后台用户ID", display = false)
private Long userId; private Long userId;
@Query(name = "微信信息", display = false)
private String studentWeixinInfo;
private String studentStatuses; private String studentStatuses;
private String classIds; private String classIds;

@ -10,6 +10,7 @@ queryByCondition
t.student_sn, t.student_sn,
t.student_mobile, t.student_mobile,
t.student_email, t.student_email,
t.student_weixin_info,
t.student_status, t.student_status,
t.add_time, t.add_time,
t.org_id, t.org_id,

@ -16,20 +16,22 @@ layui.define([ 'form', 'laydate', 'table','element','upload','resourcesInfoApi']
var chapterId = $("select[name='courseInfoId_1']").val();//章ID var chapterId = $("select[name='courseInfoId_1']").val();//章ID
var courseInfoId = $("select[name='courseInfoId_2']").val();//节ID var courseInfoId = $("select[name='courseInfoId_2']").val();//节ID
var resourcesInfoId = $("input[name='resourcesInfoId']").val(); var resourcesInfoId = $("input[name='resourcesInfoId']").val();
var resourcesInfoType = $("select[name='resourcesInfoType']").val(); // 资源类型(详细见数据字典resources_info_type)
var ret = ""; var ret = "";
if($.isEmpty(resourcesInfoId)){ if($.isEmpty(resourcesInfoId)){
var resourcesInfoJson = new Array(); var resourcesInfoJson = new Array();
$("#demoList tr").each(function (){ $("#demoList tr").each(function (){
var fileName = $(this).find("input[name='fileName']").val(); var fileName = $(this).find("input[name='fileName']").val();
var format = fileName.substr((~-fileName.lastIndexOf('.') >>> 0) + 2).toLowerCase();//获取文件后缀小写 var format = fileName.substr((~-fileName.lastIndexOf('.') >>> 0) + 2).toLowerCase();//获取文件后缀小写
var resourcesInfoType = ''; //资源类型(1视频 2课件 3附件) // var resourcesInfoType = ''; //资源类型(详细见数据字典resources_info_type)
if('、avi、wmv、mpeg、mp4、mov、mkv、flv、f4v、m4v、rmvb、rm、3gp、dat、ts、mts、vob、'.indexOf("、"+format+"、") >= 0){ // if('、avi、wmv、mpeg、mp4、mov、mkv、flv、f4v、m4v、rmvb、rm、3gp、dat、ts、mts、vob、'.indexOf("、"+format+"、") >= 0){
resourcesInfoType = 1; // resourcesInfoType = 1;
}else if('、pdf、xls、xlsx、doc、docx、ppt、pptx、'.indexOf("、"+format+"、") >= 0){ // }else if('、pdf、xls、xlsx、doc、docx、ppt、pptx、'.indexOf("、"+format+"、") >= 0){
resourcesInfoType = 2; // resourcesInfoType = 2;
}else { // }else {
resourcesInfoType = 3; // resourcesInfoType = 3;
} // }
resourcesInfoJson.push({ resourcesInfoJson.push({
courseInfoId:courseInfoId, courseInfoId:courseInfoId,
resourcesInfoContent:$(this).find("input[name='imgFile']").val(), resourcesInfoContent:$(this).find("input[name='imgFile']").val(),

@ -94,6 +94,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
{ {
field : 'resourcesInfoType', width:150,title : '资源类型',align:"center",templet:function (d){//(1视频 2课件 3附件) field : 'resourcesInfoType', width:150,title : '资源类型',align:"center",templet:function (d){//(1视频 2课件 3附件)
return d.resourcesInfoType == 1?"视频":d.resourcesInfoType == 2?"课件":d.resourcesInfoType == 3?"附件":'-'; return d.resourcesInfoType == 1?"视频":d.resourcesInfoType == 2?"课件":d.resourcesInfoType == 3?"附件":'-';
} }
}, },
{ {

@ -55,6 +55,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'studentEmail', field : 'studentEmail',
title : '学生邮箱',align: "center" title : '学生邮箱',align: "center"
}, },
{
field : 'studentWeixinInfo',
title : '微信号',align: "center"
},
{ {
field : 'addTime', field : 'addTime',

@ -54,6 +54,10 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'universitiesCollegesContactsEmail', field : 'universitiesCollegesContactsEmail',
title : '联系人邮箱',align: "center" title : '联系人邮箱',align: "center"
}, },
{
field : 'addTime',
title : '创建日期',align: "center"
},
{ {
field : 'userId',title : '操作',align:"center", templet: function (d) { field : 'userId',title : '操作',align:"center", templet: function (d) {
var htm = '<button type="button" class="layui-btn layui-btn-xs" lay-event="edit">编辑</button></a>'; var htm = '<button type="button" class="layui-btn layui-btn-xs" lay-event="edit">编辑</button></a>';

@ -53,6 +53,14 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'useEndTime', field : 'useEndTime',
title : '结束时间',align: "center" title : '结束时间',align: "center"
}, },
{
field : 'universitiesCollegesAuthCode',
title : '动态授权码',align: "center",templet:function (d) {
return `<button type="button" class="layui-btn layui-btn-xs"
style="background-color: #FAFAFA !important; font-weight: bold; color: #009688; font-size: 14px;" lay-event="clipboard">
${d.universitiesCollegesAuthCode}</button>`;
}
},
{ {
field : 'userId',title : '操作',align:"center", templet: function (d) { field : 'userId',title : '操作',align:"center", templet: function (d) {
var htm = '<button type="button" class="layui-btn layui-btn-xs bg_button" lay-event="edit">编辑</button></a>'; var htm = '<button type="button" class="layui-btn layui-btn-xs bg_button" lay-event="edit">编辑</button></a>';
@ -92,6 +100,9 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
}, },
export:function (){ export:function (){
},
clipboard() {
console.log(this)
} }
}; };
$('.ext-toolbar').on('click', function() { $('.ext-toolbar').on('click', function() {

@ -42,6 +42,15 @@
</div> </div>
</div> </div>
</div> </div>
<div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label">资源类型:</label>
<div class="layui-input-block" style="width: 400px;">
<layui:simpleDictSelect style='layui-input-inline' value="${resourcesInfo.resourcesInfoType}" type="resources_info_type"
id="resourcesInfoType" name="resourcesInfoType" layFilter="select_courseInfoIds_3"/>
</div>
</div>
</div>
<div class="layui-row" style="${resourcesInfo.resourcesInfoId != null?'display:none':''}"> <div class="layui-row" style="${resourcesInfo.resourcesInfoId != null?'display:none':''}">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">上传资源:</label> <label class="layui-form-label">上传资源:</label>

@ -86,6 +86,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">学生微信号:</label>
<div class="layui-input-inline">
<input type="text" name="studentWeixinInfo" value="${student.studentWeixinInfo}" class="layui-input" >
</div>
</div>
</div>
</div>
<input type="hidden" name="studentId" value="${student.studentId}" /> <input type="hidden" name="studentId" value="${student.studentId}" />
</form> </form>
<!--#} --> <!--#} -->

Loading…
Cancel
Save