Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

beetlsql3-dev
姚丹ab
commit 6ed2a4ab96

@ -13,6 +13,7 @@ import com.ibeetl.admin.core.rbac.tree.FunctionItem;
import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.service.CorePlatformService;
import com.ibeetl.admin.core.util.PlatformException;
import org.apache.commons.collections4.CollectionUtils;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -186,14 +187,15 @@ public class FunctionConsoleService extends CoreBaseService<CoreFunction> {
}
List<CoreRoleFunction> list = new ArrayList<>();
for(Long add:adds){
CoreRoleFunction function = new CoreRoleFunction();
function.setCreateTime(new Date());
function.setRoleId(roleId);
function.setFunctionId(add);
function.setDataAccessType(5);// TODO 暂时都定为5
this.sqlManager.insert(function);
list.add(function);
// this.sqlManager.insert(function);
// CoreMenu menu = queryFunctionMenu(add);
// if(menu!=null){
// //同时,需要增加菜单
@ -203,6 +205,9 @@ public class FunctionConsoleService extends CoreBaseService<CoreFunction> {
// sysRoleMenuDao.insert(roleMenu);
// }
}
if (CollectionUtils.isNotEmpty(list)) {
this.sqlManager.insertBatch(CoreRoleFunction.class, list);
}
//清楚缓存
platformService.clearFunctionCache();

@ -277,6 +277,10 @@ public class CorePlatformService {
return true;
}
String str = functionCode;
CoreFunction functionByCode = sysFunctionDao.getFunctionByCode(str);
if (functionByCode != null && StringUtils.isNotEmpty(functionByCode.getAccessUrl())) {
return true;
}
List<CoreRoleFunction> list = sysRoleFunctionDao.getRoleFunction(userId, orgId, str);
boolean canAccess = !list.isEmpty();
if (canAccess) {

@ -0,0 +1,22 @@
package com.ibeetl.jlw.entity;
/**
*
*
* @Version 0.0.1
* @Author
* @Date 2022/10/26 21:57
*/
public class SchoolAdminIndex {
//注册学生数
//注册老师数
//登录人数
//登录人次
}

@ -0,0 +1,33 @@
package com.ibeetl.jlw.entity;
import java.util.List;
/**
*
*
* @Version 0.0.1
* @Author
* @Date 2022/10/26 22:11
*/
public class StudentHandsOnTaskReportParam {
private Long count;
private List<StudentHandsOnTaskReportParams> params;
public Long getCount() {
return count;
}
public void setCount(Long count) {
this.count = count;
}
public List<StudentHandsOnTaskReportParams> getParams() {
return params;
}
public void setParams(List<StudentHandsOnTaskReportParams> params) {
this.params = params;
}
}

@ -0,0 +1,50 @@
package com.ibeetl.jlw.entity;
/**
*
*
* @Version 0.0.1
* @Author
* @Date 2022/10/26 22:12
*/
public class StudentHandsOnTaskReportParams {
/**
*
*/
private String courseName;
/**
*
*/
private String className;
/**
*
*/
private Long toBeReviewed;
public String getCourseName() {
return courseName;
}
public void setCourseName(String courseName) {
this.courseName = courseName;
}
public String getClassName() {
return className;
}
public void setClassName(String className) {
this.className = className;
}
public Long getToBeReviewed() {
return toBeReviewed;
}
public void setToBeReviewed(Long toBeReviewed) {
this.toBeReviewed = toBeReviewed;
}
}

@ -74,6 +74,7 @@ public class ApiTeacherService {
List<Long> collect = openCourseList.stream().map(TeacherOpenCourseMergeTeacher::getTeacherOpenCourseId).collect(Collectors.toList());
List<StudentHandsOnTaskReport> reportList = studentHandsOnTaskReportService.getReportList(collect);
return TeacherIndexData.builder()
.toDoList(reportList)
.noticeList(noticeList)

@ -48,4 +48,8 @@ public class StatisticalAnalysisController {
return JsonResult.success(detail);
}
/**
*
*/
}

@ -373,4 +373,4 @@ getReportList
* 根据开课ID进行查询
select t.*
from student_hands_on_task_report t where t.teacherOpenCourseId in (#join(collect)#)
from student_hands_on_task_report t where t.teacher_open_course_id in (#join(collect)#)

Loading…
Cancel
Save