增加一些接口
parent
99374a5276
commit
ef2e6cba7e
@ -0,0 +1,181 @@
|
||||
package com.ibeetl.jlw.entity;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import com.ibeetl.admin.core.entity.BaseEntity;
|
||||
import org.beetl.sql.annotation.entity.*;
|
||||
|
||||
import com.ibeetl.admin.core.util.ValidateConfig;
|
||||
|
||||
import com.ibeetl.admin.core.annotation.Dict;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/*
|
||||
* 学生-课程实操-时长日志
|
||||
* gen by Spring Boot2 Admin 2022-12-26
|
||||
*/
|
||||
public class StudentHandsOnTaskLog extends BaseEntity{
|
||||
|
||||
//ID
|
||||
@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
|
||||
// @SeqID(name = ORACLE_CORE_SEQ_NAME)
|
||||
@AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.StudentHandsOnTaskLog")
|
||||
|
||||
private Long studentHandsOnTaskPptId ;
|
||||
|
||||
//课程开课ID
|
||||
|
||||
private Long teacherOpenCourseId ;
|
||||
|
||||
//课程实操ID
|
||||
|
||||
private Long handsOnId ;
|
||||
|
||||
//课程实操任务ID
|
||||
|
||||
private Long handsOnTaskId ;
|
||||
|
||||
//创建时间
|
||||
|
||||
private Date createTime ;
|
||||
|
||||
//组织ID
|
||||
|
||||
private Long orgId ;
|
||||
|
||||
//用户ID
|
||||
|
||||
private Long userId ;
|
||||
|
||||
//最后更新时间
|
||||
|
||||
private Date lastUpdateTime ;
|
||||
|
||||
//学生ID
|
||||
|
||||
private Long studentId ;
|
||||
|
||||
public StudentHandsOnTaskLog(){
|
||||
}
|
||||
|
||||
/**ID
|
||||
*@return
|
||||
*/
|
||||
public Long getStudentHandsOnTaskPptId(){
|
||||
return studentHandsOnTaskPptId;
|
||||
}
|
||||
/**ID
|
||||
*@param studentHandsOnTaskPptId
|
||||
*/
|
||||
public void setStudentHandsOnTaskPptId(Long studentHandsOnTaskPptId){
|
||||
this.studentHandsOnTaskPptId = studentHandsOnTaskPptId;
|
||||
}
|
||||
|
||||
/**课程开课ID
|
||||
*@return
|
||||
*/
|
||||
public Long getTeacherOpenCourseId(){
|
||||
return teacherOpenCourseId;
|
||||
}
|
||||
/**课程开课ID
|
||||
*@param teacherOpenCourseId
|
||||
*/
|
||||
public void setTeacherOpenCourseId(Long teacherOpenCourseId){
|
||||
this.teacherOpenCourseId = teacherOpenCourseId;
|
||||
}
|
||||
|
||||
/**课程实操ID
|
||||
*@return
|
||||
*/
|
||||
public Long getHandsOnId(){
|
||||
return handsOnId;
|
||||
}
|
||||
/**课程实操ID
|
||||
*@param handsOnId
|
||||
*/
|
||||
public void setHandsOnId(Long handsOnId){
|
||||
this.handsOnId = handsOnId;
|
||||
}
|
||||
|
||||
/**课程实操任务ID
|
||||
*@return
|
||||
*/
|
||||
public Long getHandsOnTaskId(){
|
||||
return handsOnTaskId;
|
||||
}
|
||||
/**课程实操任务ID
|
||||
*@param handsOnTaskId
|
||||
*/
|
||||
public void setHandsOnTaskId(Long handsOnTaskId){
|
||||
this.handsOnTaskId = handsOnTaskId;
|
||||
}
|
||||
|
||||
/**创建时间
|
||||
*@return
|
||||
*/
|
||||
public Date getCreateTime(){
|
||||
return createTime;
|
||||
}
|
||||
/**创建时间
|
||||
*@param createTime
|
||||
*/
|
||||
public void setCreateTime(Date createTime){
|
||||
this.createTime = createTime;
|
||||
}
|
||||
|
||||
/**组织ID
|
||||
*@return
|
||||
*/
|
||||
public Long getOrgId(){
|
||||
return orgId;
|
||||
}
|
||||
/**组织ID
|
||||
*@param orgId
|
||||
*/
|
||||
public void setOrgId(Long orgId){
|
||||
this.orgId = orgId;
|
||||
}
|
||||
|
||||
/**用户ID
|
||||
*@return
|
||||
*/
|
||||
public Long getUserId(){
|
||||
return userId;
|
||||
}
|
||||
/**用户ID
|
||||
*@param userId
|
||||
*/
|
||||
public void setUserId(Long userId){
|
||||
this.userId = userId;
|
||||
}
|
||||
|
||||
/**最后更新时间
|
||||
*@return
|
||||
*/
|
||||
public Date getLastUpdateTime(){
|
||||
return lastUpdateTime;
|
||||
}
|
||||
/**最后更新时间
|
||||
*@param lastUpdateTime
|
||||
*/
|
||||
public void setLastUpdateTime(Date lastUpdateTime){
|
||||
this.lastUpdateTime = lastUpdateTime;
|
||||
}
|
||||
|
||||
/**学生ID
|
||||
*@return
|
||||
*/
|
||||
public Long getStudentId(){
|
||||
return studentId;
|
||||
}
|
||||
/**学生ID
|
||||
*@param studentId
|
||||
*/
|
||||
public void setStudentId(Long studentId){
|
||||
this.studentId = studentId;
|
||||
}
|
||||
|
||||
|
||||
}
|
@ -0,0 +1,27 @@
|
||||
package com.ibeetl.jlw.entity.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 类功能说明
|
||||
*
|
||||
* @Version 0.0.1
|
||||
* @Author 许良彤
|
||||
* @Date 2022/12/26 20:47
|
||||
*/
|
||||
@Data
|
||||
public class HandsOnTaskScoreVO {
|
||||
|
||||
private Long handsOnTaskId;
|
||||
|
||||
/**
|
||||
* 分数
|
||||
*/
|
||||
private Double score;
|
||||
|
||||
/**
|
||||
* 时长
|
||||
*/
|
||||
private Long time;
|
||||
|
||||
}
|
@ -0,0 +1,26 @@
|
||||
package com.ibeetl.jlw.entity.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 类功能说明
|
||||
*
|
||||
* @Version 0.0.1
|
||||
* @Author 许良彤
|
||||
* @Date 2022/12/26 20:45
|
||||
*/
|
||||
@Data
|
||||
public class StudentHandsOnScoreVO {
|
||||
|
||||
private Long handsOnId;
|
||||
|
||||
/**
|
||||
* 总分
|
||||
*/
|
||||
private Double sumScore;
|
||||
|
||||
private List<HandsOnTaskScoreVO> handsOnTaskScores;
|
||||
|
||||
}
|
@ -0,0 +1,201 @@
|
||||
package com.ibeetl.jlw.service;
|
||||
|
||||
import java.io.*;
|
||||
import java.text.DateFormat;
|
||||
import java.text.DecimalFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.jlw.util.ToolUtils;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.ibeetl.admin.core.entity.CoreUser;
|
||||
import com.ibeetl.admin.core.util.TimeTool;
|
||||
import com.ibeetl.admin.core.web.JsonResult;
|
||||
import com.ibeetl.admin.core.web.JsonReturnCode;
|
||||
import com.ibeetl.jlw.dao.StudentHandsOnTaskLogDao;
|
||||
import com.ibeetl.jlw.entity.StudentHandsOnTaskLog;
|
||||
import com.ibeetl.jlw.web.query.StudentHandsOnTaskLogQuery;
|
||||
import com.ibeetl.jlw.entity.FileEntity;
|
||||
|
||||
import com.ibeetl.admin.core.service.CoreBaseService;
|
||||
import com.ibeetl.admin.core.util.PlatformException;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
||||
import org.apache.poi.ss.usermodel.Cell;
|
||||
import org.apache.poi.ss.usermodel.Row;
|
||||
import org.apache.poi.ss.usermodel.Sheet;
|
||||
import org.apache.poi.ss.usermodel.Workbook;
|
||||
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
||||
import org.beetl.sql.core.engine.PageQuery;
|
||||
import org.beetl.sql.core.SqlId;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
|
||||
|
||||
/**
|
||||
* 学生实操日志 Service
|
||||
* 当分布式ID开启后请勿使用insert(*,true)
|
||||
*/
|
||||
|
||||
@Service
|
||||
@Transactional
|
||||
@Validated
|
||||
public class StudentHandsOnTaskLogService extends CoreBaseService<StudentHandsOnTaskLog>{
|
||||
|
||||
@Autowired private StudentHandsOnTaskLogDao studentHandsOnTaskLogDao;
|
||||
|
||||
public PageQuery<StudentHandsOnTaskLog>queryByCondition(PageQuery query){
|
||||
PageQuery ret = studentHandsOnTaskLogDao.queryByCondition(query);
|
||||
queryListAfter(ret.getList());
|
||||
return ret;
|
||||
}
|
||||
|
||||
public PageQuery<StudentHandsOnTaskLog>queryByConditionQuery(PageQuery query){
|
||||
PageQuery ret = studentHandsOnTaskLogDao.queryByConditionQuery(query);
|
||||
queryListAfter(ret.getList());
|
||||
return ret;
|
||||
}
|
||||
|
||||
public void deleteByList(List list){
|
||||
String ids = "";
|
||||
ToolUtils.deleteNullList(list);
|
||||
for(int i=0;null != list && i<list.size();i++){
|
||||
ids += list.get(i).toString()+(i==list.size()-1?"":",");
|
||||
}
|
||||
if(StringUtils.isNotBlank(ids)){
|
||||
studentHandsOnTaskLogDao.deleteStudentHandsOnTaskLogByIds(ids);
|
||||
}
|
||||
}
|
||||
|
||||
public void deleteStudentHandsOnTaskLog(String ids){
|
||||
try {
|
||||
studentHandsOnTaskLogDao.deleteStudentHandsOnTaskLogByIds(ids);
|
||||
} catch (Exception e) {
|
||||
throw new PlatformException("批量删除学生实操日志失败", e);
|
||||
}
|
||||
}
|
||||
|
||||
public String addAll(StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery){
|
||||
String msg = "";
|
||||
List<StudentHandsOnTaskLog> studentHandsOnTaskLogList = new ArrayList<>();
|
||||
try {
|
||||
studentHandsOnTaskLogList = JSON.parseArray(studentHandsOnTaskLogQuery.getStudentHandsOnTaskLogJsonStr(), StudentHandsOnTaskLog.class);
|
||||
} catch (Exception e) {
|
||||
try {
|
||||
studentHandsOnTaskLogList.add(JSONObject.parseObject(studentHandsOnTaskLogQuery.getStudentHandsOnTaskLogJsonStr(), StudentHandsOnTaskLog.class));
|
||||
} catch (Exception e1) {}
|
||||
}
|
||||
ToolUtils.deleteNullList(studentHandsOnTaskLogList);
|
||||
if(null != studentHandsOnTaskLogList && studentHandsOnTaskLogList.size()>0){
|
||||
for(int i=0;i<studentHandsOnTaskLogList.size();i++){
|
||||
StudentHandsOnTaskLog studentHandsOnTaskLog = studentHandsOnTaskLogList.get(i);
|
||||
studentHandsOnTaskLog.setUserId(studentHandsOnTaskLogQuery.getUserId());
|
||||
studentHandsOnTaskLog.setOrgId(studentHandsOnTaskLogQuery.getOrgId());
|
||||
}
|
||||
insertBatch(studentHandsOnTaskLogList);
|
||||
}
|
||||
return msg;
|
||||
}
|
||||
|
||||
public JsonResult add(StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery){
|
||||
String msg = "";
|
||||
StudentHandsOnTaskLog studentHandsOnTaskLog = studentHandsOnTaskLogQuery.pojo();
|
||||
studentHandsOnTaskLogDao.insert(studentHandsOnTaskLog);
|
||||
studentHandsOnTaskLogQuery.setStudentHandsOnTaskPptId(studentHandsOnTaskLog.getStudentHandsOnTaskPptId());
|
||||
JsonResult jsonResult = new JsonResult();
|
||||
jsonResult.setData(studentHandsOnTaskLog.getStudentHandsOnTaskPptId());//自增的ID丢进去
|
||||
jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
|
||||
jsonResult.setMsg(msg);
|
||||
return jsonResult;
|
||||
}
|
||||
|
||||
public String edit(StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery){
|
||||
String msg = "";
|
||||
StudentHandsOnTaskLog studentHandsOnTaskLog = studentHandsOnTaskLogQuery.pojo();
|
||||
studentHandsOnTaskLogDao.updateTemplateById(studentHandsOnTaskLog);
|
||||
return msg;
|
||||
}
|
||||
|
||||
public String updateGivenByIds(StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery){
|
||||
String msg = "";
|
||||
if(StringUtils.isNotBlank(studentHandsOnTaskLogQuery.get_given())){
|
||||
boolean flag = studentHandsOnTaskLogDao.updateGivenByIds(studentHandsOnTaskLogQuery) > 0;
|
||||
if(!flag){
|
||||
msg = "更新指定参数失败";
|
||||
}
|
||||
}else{
|
||||
msg = "指定参数为空";
|
||||
}
|
||||
return msg;
|
||||
}
|
||||
|
||||
public List<StudentHandsOnTaskLog> getValues (Object paras){
|
||||
return sqlManager.select(SqlId.of("jlw.studentHandsOnTaskLog.getStudentHandsOnTaskLogValues"), StudentHandsOnTaskLog.class, paras);
|
||||
}
|
||||
|
||||
public List<StudentHandsOnTaskLog> getValuesByQuery (StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery){
|
||||
return studentHandsOnTaskLogDao.getValuesByQuery(studentHandsOnTaskLogQuery);
|
||||
}
|
||||
|
||||
public List<StudentHandsOnTaskLog> getValuesByQueryNotWithPermission (StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery){
|
||||
return studentHandsOnTaskLogDao.getValuesByQueryNotWithPermission(studentHandsOnTaskLogQuery);
|
||||
}
|
||||
|
||||
public StudentHandsOnTaskLog getInfo (Long studentHandsOnTaskPptId){
|
||||
StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery = new StudentHandsOnTaskLogQuery();
|
||||
studentHandsOnTaskLogQuery.setStudentHandsOnTaskPptId(studentHandsOnTaskPptId);
|
||||
List<StudentHandsOnTaskLog> list = studentHandsOnTaskLogDao.getValuesByQuery(studentHandsOnTaskLogQuery);
|
||||
if(null != list && list.size()>0){
|
||||
return list.get(0);
|
||||
}else{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public StudentHandsOnTaskLog getInfo (StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery){
|
||||
List<StudentHandsOnTaskLog> list = studentHandsOnTaskLogDao.getValuesByQuery(studentHandsOnTaskLogQuery);
|
||||
if(null != list && list.size()>0){
|
||||
return list.get(0);
|
||||
}else{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public JsonResult addDo(StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery) {
|
||||
String msg = "";
|
||||
StudentHandsOnTaskLog studentHandsOnTaskLog = studentHandsOnTaskLogQuery.pojo();
|
||||
Long studentId = studentHandsOnTaskLog.getStudentId();
|
||||
Long handsOnTaskId = studentHandsOnTaskLog.getHandsOnTaskId();
|
||||
StudentHandsOnTaskLogQuery logQuery = new StudentHandsOnTaskLogQuery();
|
||||
logQuery.setStudentId(studentId);
|
||||
logQuery.setHandsOnTaskId(handsOnTaskId);
|
||||
JsonResult jsonResult = new JsonResult();
|
||||
List<StudentHandsOnTaskLog> valuesByQueryNotWithPermission = getValuesByQueryNotWithPermission(logQuery);
|
||||
if (CollectionUtil.isNotEmpty(valuesByQueryNotWithPermission)) {
|
||||
StudentHandsOnTaskLog studentHandsOnTaskLog1 = valuesByQueryNotWithPermission.get(0);
|
||||
studentHandsOnTaskLog1.setLastUpdateTime(new Date());
|
||||
studentHandsOnTaskLogDao.updateById(studentHandsOnTaskLog1);
|
||||
}else {
|
||||
studentHandsOnTaskLog.setCreateTime(new Date());
|
||||
studentHandsOnTaskLog.setLastUpdateTime(new Date());
|
||||
studentHandsOnTaskLogDao.insert(studentHandsOnTaskLog);
|
||||
jsonResult.setData(studentHandsOnTaskLog.getStudentHandsOnTaskPptId());//自增的ID丢进去
|
||||
}
|
||||
|
||||
studentHandsOnTaskLogQuery.setStudentHandsOnTaskPptId(studentHandsOnTaskLog.getStudentHandsOnTaskPptId());
|
||||
|
||||
|
||||
jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
|
||||
jsonResult.setMsg(msg);
|
||||
return jsonResult;
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,243 @@
|
||||
package com.ibeetl.jlw.web;
|
||||
|
||||
import cn.hutool.core.lang.Assert;
|
||||
import cn.jlw.Interceptor.RFile;
|
||||
import cn.jlw.Interceptor.SCoreUser;
|
||||
import cn.jlw.Interceptor.GetFile;
|
||||
import cn.jlw.util.ToolUtils;
|
||||
import cn.jlw.validate.ValidateConfig;
|
||||
import com.ibeetl.admin.core.entity.CoreUser;
|
||||
import com.ibeetl.admin.core.file.FileService;
|
||||
import com.ibeetl.admin.core.util.ConvertUtil;
|
||||
import com.ibeetl.admin.core.util.PlatformException;
|
||||
import com.ibeetl.admin.core.util.TimeTool;
|
||||
import com.ibeetl.admin.core.web.JsonResult;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.poi.hssf.usermodel.*;
|
||||
import org.apache.poi.ss.usermodel.*;
|
||||
import org.apache.poi.ss.usermodel.Cell;
|
||||
import org.apache.poi.ss.usermodel.HorizontalAlignment;
|
||||
import org.apache.poi.ss.usermodel.Row;
|
||||
import org.apache.poi.ss.usermodel.Sheet;
|
||||
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
||||
import org.beetl.sql.core.engine.PageQuery;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import com.ibeetl.admin.console.web.dto.DictExcelImportData;
|
||||
import com.ibeetl.admin.console.web.query.UserQuery;
|
||||
import com.ibeetl.admin.core.annotation.Function;
|
||||
import com.ibeetl.jlw.entity.*;
|
||||
import com.ibeetl.jlw.service.*;
|
||||
import com.ibeetl.jlw.web.query.*;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.InputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
|
||||
|
||||
/**
|
||||
* 学生实操日志 学生-课程实操-时长日志 接口
|
||||
* 切记不要对非线程安全的静态变量进行写操作
|
||||
*/
|
||||
|
||||
@RestController
|
||||
@Validated
|
||||
public class StudentHandsOnTaskLogController{
|
||||
|
||||
private final Log log = LogFactory.getLog(this.getClass());
|
||||
private static final String MODEL = "/jlw/studentHandsOnTaskLog";
|
||||
private static final String API = "/api/studentHandsOnTaskLog";
|
||||
|
||||
|
||||
@Autowired private StudentHandsOnTaskLogService studentHandsOnTaskLogService;
|
||||
|
||||
@Autowired FileService fileService;
|
||||
|
||||
/* 前端接口 */
|
||||
|
||||
@PostMapping(API + "/getPageList.do")
|
||||
public JsonResult<PageQuery> getPageList(StudentHandsOnTaskLogQuery condition,@SCoreUser CoreUser coreUser){
|
||||
if(null == coreUser){
|
||||
return JsonResult.failMessage("请登录后再操作");
|
||||
}else{
|
||||
PageQuery page = condition.getPageQuery();
|
||||
studentHandsOnTaskLogService.queryByConditionQuery(page);
|
||||
return JsonResult.success(page);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping(API + "/getInfo.do")
|
||||
public JsonResult<StudentHandsOnTaskLog>getInfo(StudentHandsOnTaskLogQuery param,@SCoreUser CoreUser coreUser) {
|
||||
if(null == coreUser){
|
||||
return JsonResult.failMessage("请登录后再操作");
|
||||
}else{
|
||||
StudentHandsOnTaskLog studentHandsOnTaskLog = studentHandsOnTaskLogService.getInfo(param);
|
||||
return JsonResult.success(studentHandsOnTaskLog);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping(API + "/getList.do")
|
||||
public JsonResult<List<StudentHandsOnTaskLog>>getList(StudentHandsOnTaskLogQuery param,@SCoreUser CoreUser coreUser) {
|
||||
if(null == coreUser){
|
||||
return JsonResult.failMessage("请登录后再操作");
|
||||
}else{
|
||||
List<StudentHandsOnTaskLog>list = studentHandsOnTaskLogService.getValuesByQuery(param);
|
||||
return JsonResult.success(list);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* 后台页面 */
|
||||
|
||||
@GetMapping(MODEL + "/index.do")
|
||||
@Function("studentHandsOnTaskLog.query")
|
||||
public ModelAndView index() {
|
||||
ModelAndView view = new ModelAndView("/jlw/studentHandsOnTaskLog/index.html") ;
|
||||
view.addObject("search", StudentHandsOnTaskLogQuery.class.getName());
|
||||
return view;
|
||||
}
|
||||
|
||||
@GetMapping(MODEL + "/edit.do")
|
||||
@Function("studentHandsOnTaskLog.edit")
|
||||
public ModelAndView edit(Long studentHandsOnTaskPptId) {
|
||||
ModelAndView view = new ModelAndView("/jlw/studentHandsOnTaskLog/edit.html");
|
||||
StudentHandsOnTaskLog studentHandsOnTaskLog = studentHandsOnTaskLogService.queryById(studentHandsOnTaskPptId);
|
||||
view.addObject("studentHandsOnTaskLog", studentHandsOnTaskLog);
|
||||
return view;
|
||||
}
|
||||
|
||||
@GetMapping(MODEL + "/add.do")
|
||||
@Function("studentHandsOnTaskLog.add")
|
||||
public ModelAndView add(Long studentHandsOnTaskPptId) {
|
||||
ModelAndView view = new ModelAndView("/jlw/studentHandsOnTaskLog/add.html");
|
||||
if(null != studentHandsOnTaskPptId){
|
||||
StudentHandsOnTaskLog studentHandsOnTaskLog = studentHandsOnTaskLogService.queryById(studentHandsOnTaskPptId);
|
||||
view.addObject("studentHandsOnTaskLog", studentHandsOnTaskLog);
|
||||
}else {
|
||||
view.addObject("studentHandsOnTaskLog", new StudentHandsOnTaskLog());
|
||||
}
|
||||
return view;
|
||||
}
|
||||
|
||||
/* 后台接口 */
|
||||
|
||||
@PostMapping(MODEL + "/list.json")
|
||||
@Function("studentHandsOnTaskLog.query")
|
||||
public JsonResult<PageQuery> list(StudentHandsOnTaskLogQuery condition){
|
||||
PageQuery page = condition.getPageQuery();
|
||||
studentHandsOnTaskLogService.queryByCondition(page);
|
||||
return JsonResult.success(page);
|
||||
}
|
||||
|
||||
@PostMapping(MODEL + "/addAll.json")
|
||||
@Function("studentHandsOnTaskLog.add")
|
||||
public JsonResult addAll(StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery,@SCoreUser CoreUser coreUser){
|
||||
if(null == coreUser){
|
||||
return JsonResult.failMessage("请登录后再操作");
|
||||
}else{
|
||||
studentHandsOnTaskLogQuery.setUserId(coreUser.getId());
|
||||
studentHandsOnTaskLogQuery.setOrgId(coreUser.getOrgId());
|
||||
String msg = studentHandsOnTaskLogService.addAll(studentHandsOnTaskLogQuery);
|
||||
if (StringUtils.isBlank(msg)) {
|
||||
return JsonResult.success();
|
||||
} else {
|
||||
return JsonResult.failMessage("新增失败,"+msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping(MODEL + "/add.json")
|
||||
@Function("studentHandsOnTaskLog.add")
|
||||
public JsonResult add(@Validated(ValidateConfig.ADD.class) StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery, BindingResult result,@SCoreUser CoreUser coreUser){
|
||||
if(result.hasErrors()){
|
||||
return JsonResult.failMessage(result);
|
||||
}else{
|
||||
|
||||
studentHandsOnTaskLogQuery.setUserId(coreUser.getId());
|
||||
studentHandsOnTaskLogQuery.setOrgId(coreUser.getOrgId());
|
||||
return studentHandsOnTaskLogService.add(studentHandsOnTaskLogQuery);
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping(MODEL + "/edit.json")
|
||||
@Function("studentHandsOnTaskLog.edit")
|
||||
public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery, BindingResult result) {
|
||||
if(result.hasErrors()){
|
||||
return JsonResult.failMessage(result);
|
||||
}else {
|
||||
Assert.notNull(getUser(), "请登录后再操作");
|
||||
studentHandsOnTaskLogQuery.setUserId(null);
|
||||
studentHandsOnTaskLogQuery.setOrgId(null);
|
||||
String msg = studentHandsOnTaskLogService.edit(studentHandsOnTaskLogQuery);
|
||||
if (StringUtils.isBlank(msg)) {
|
||||
return JsonResult.success();
|
||||
} else {
|
||||
return JsonResult.failMessage("更新失败,"+msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping(MODEL + "/view.json")
|
||||
@Function("studentHandsOnTaskLog.query")
|
||||
public JsonResult<StudentHandsOnTaskLog>queryInfo(Long studentHandsOnTaskPptId) {
|
||||
StudentHandsOnTaskLog studentHandsOnTaskLog = studentHandsOnTaskLogService.queryById( studentHandsOnTaskPptId);
|
||||
return JsonResult.success(studentHandsOnTaskLog);
|
||||
}
|
||||
|
||||
@GetMapping(MODEL + "/getValues.json")
|
||||
@Function("studentHandsOnTaskLog.query")
|
||||
public JsonResult<List<StudentHandsOnTaskLog>>getValues(StudentHandsOnTaskLogQuery param) {
|
||||
List<StudentHandsOnTaskLog>list = studentHandsOnTaskLogService.getValuesByQuery(param);
|
||||
return JsonResult.success(list);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping(MODEL + "/delete.json")
|
||||
@Function("studentHandsOnTaskLog.delete")
|
||||
@ResponseBody
|
||||
public JsonResult delete(String ids) {
|
||||
studentHandsOnTaskLogService.deleteStudentHandsOnTaskLog(ids);
|
||||
return JsonResult.success();
|
||||
}
|
||||
|
||||
|
||||
@PostMapping(API + "/add.do")
|
||||
public JsonResult addDo(@Validated(ValidateConfig.ADD.class) StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery, BindingResult result,@SCoreUser CoreUser coreUser){
|
||||
if(result.hasErrors()){
|
||||
return JsonResult.failMessage(result);
|
||||
}else{
|
||||
|
||||
studentHandsOnTaskLogQuery.setUserId(coreUser.getId());
|
||||
studentHandsOnTaskLogQuery.setOrgId(coreUser.getOrgId());
|
||||
return studentHandsOnTaskLogService.addDo(studentHandsOnTaskLogQuery);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
@ -0,0 +1,174 @@
|
||||
package com.ibeetl.jlw.web.query;
|
||||
|
||||
import cn.jlw.validate.ValidateConfig;
|
||||
import com.ibeetl.jlw.entity.StudentHandsOnTaskLog;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import com.ibeetl.admin.core.annotation.Query;
|
||||
import com.ibeetl.admin.core.util.Tool;
|
||||
import com.ibeetl.admin.core.util.enums.CoreDictType;
|
||||
import com.ibeetl.admin.core.web.query.PageParam;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
*学生实操日志查询
|
||||
*/
|
||||
public class StudentHandsOnTaskLogQuery extends PageParam {
|
||||
@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
|
||||
@Query(name = "ID", display = false)
|
||||
private Long studentHandsOnTaskPptId;
|
||||
@Query(name = "课程开课ID", display = false)
|
||||
private Long teacherOpenCourseId;
|
||||
@Query(name = "课程实操ID", display = false)
|
||||
private Long handsOnId;
|
||||
@Query(name = "课程实操任务ID", display = false)
|
||||
private Long handsOnTaskId;
|
||||
@Query(name = "创建时间", display = false)
|
||||
private Date createTime;
|
||||
@Query(name = "组织ID", display = false)
|
||||
private Long orgId;
|
||||
@Query(name = "用户ID", display = false)
|
||||
private Long userId;
|
||||
@Query(name = "最后更新时间", display = false)
|
||||
private Date lastUpdateTime;
|
||||
@Query(name = "学生ID", display = false)
|
||||
private Long studentId;
|
||||
|
||||
private String studentHandsOnTaskPptIdPlural;
|
||||
private String teacherOpenCourseIdPlural;
|
||||
private String handsOnIdPlural;
|
||||
private String handsOnTaskIdPlural;
|
||||
private String orgIdPlural;
|
||||
private String userIdPlural;
|
||||
private String studentIdPlural;
|
||||
|
||||
private String studentHandsOnTaskLogJsonStr;//json格式
|
||||
|
||||
private String _given;//指定更新的特定字段,多个逗号隔开
|
||||
|
||||
public Long getStudentHandsOnTaskPptId(){
|
||||
return studentHandsOnTaskPptId;
|
||||
}
|
||||
public void setStudentHandsOnTaskPptId(Long studentHandsOnTaskPptId ){
|
||||
this.studentHandsOnTaskPptId = studentHandsOnTaskPptId;
|
||||
}
|
||||
public Long getTeacherOpenCourseId(){
|
||||
return teacherOpenCourseId;
|
||||
}
|
||||
public void setTeacherOpenCourseId(Long teacherOpenCourseId ){
|
||||
this.teacherOpenCourseId = teacherOpenCourseId;
|
||||
}
|
||||
public Long getHandsOnId(){
|
||||
return handsOnId;
|
||||
}
|
||||
public void setHandsOnId(Long handsOnId ){
|
||||
this.handsOnId = handsOnId;
|
||||
}
|
||||
public Long getHandsOnTaskId(){
|
||||
return handsOnTaskId;
|
||||
}
|
||||
public void setHandsOnTaskId(Long handsOnTaskId ){
|
||||
this.handsOnTaskId = handsOnTaskId;
|
||||
}
|
||||
public Date getCreateTime(){
|
||||
return createTime;
|
||||
}
|
||||
public void setCreateTime(Date createTime ){
|
||||
this.createTime = createTime;
|
||||
}
|
||||
public Long getOrgId(){
|
||||
return orgId;
|
||||
}
|
||||
public void setOrgId(Long orgId ){
|
||||
this.orgId = orgId;
|
||||
}
|
||||
public Long getUserId(){
|
||||
return userId;
|
||||
}
|
||||
public void setUserId(Long userId ){
|
||||
this.userId = userId;
|
||||
}
|
||||
public Date getLastUpdateTime(){
|
||||
return lastUpdateTime;
|
||||
}
|
||||
public void setLastUpdateTime(Date lastUpdateTime ){
|
||||
this.lastUpdateTime = lastUpdateTime;
|
||||
}
|
||||
public Long getStudentId(){
|
||||
return studentId;
|
||||
}
|
||||
public void setStudentId(Long studentId ){
|
||||
this.studentId = studentId;
|
||||
}
|
||||
|
||||
public StudentHandsOnTaskLog pojo(){
|
||||
StudentHandsOnTaskLog pojo = new StudentHandsOnTaskLog();
|
||||
pojo.setStudentHandsOnTaskPptId(this.getStudentHandsOnTaskPptId());
|
||||
pojo.setTeacherOpenCourseId(this.getTeacherOpenCourseId());
|
||||
pojo.setHandsOnId(this.getHandsOnId());
|
||||
pojo.setHandsOnTaskId(this.getHandsOnTaskId());
|
||||
pojo.setCreateTime(this.getCreateTime());
|
||||
pojo.setOrgId(this.getOrgId());
|
||||
pojo.setUserId(this.getUserId());
|
||||
pojo.setLastUpdateTime(this.getLastUpdateTime());
|
||||
pojo.setStudentId(this.getStudentId());
|
||||
return pojo;
|
||||
}
|
||||
|
||||
public String getStudentHandsOnTaskPptIdPlural(){
|
||||
return studentHandsOnTaskPptIdPlural;
|
||||
}
|
||||
public void setStudentHandsOnTaskPptIdPlural(String studentHandsOnTaskPptIdPlural){
|
||||
this.studentHandsOnTaskPptIdPlural = studentHandsOnTaskPptIdPlural;
|
||||
}
|
||||
public String getTeacherOpenCourseIdPlural(){
|
||||
return teacherOpenCourseIdPlural;
|
||||
}
|
||||
public void setTeacherOpenCourseIdPlural(String teacherOpenCourseIdPlural){
|
||||
this.teacherOpenCourseIdPlural = teacherOpenCourseIdPlural;
|
||||
}
|
||||
public String getHandsOnIdPlural(){
|
||||
return handsOnIdPlural;
|
||||
}
|
||||
public void setHandsOnIdPlural(String handsOnIdPlural){
|
||||
this.handsOnIdPlural = handsOnIdPlural;
|
||||
}
|
||||
public String getHandsOnTaskIdPlural(){
|
||||
return handsOnTaskIdPlural;
|
||||
}
|
||||
public void setHandsOnTaskIdPlural(String handsOnTaskIdPlural){
|
||||
this.handsOnTaskIdPlural = handsOnTaskIdPlural;
|
||||
}
|
||||
public String getOrgIdPlural(){
|
||||
return orgIdPlural;
|
||||
}
|
||||
public void setOrgIdPlural(String orgIdPlural){
|
||||
this.orgIdPlural = orgIdPlural;
|
||||
}
|
||||
public String getUserIdPlural(){
|
||||
return userIdPlural;
|
||||
}
|
||||
public void setUserIdPlural(String userIdPlural){
|
||||
this.userIdPlural = userIdPlural;
|
||||
}
|
||||
public String getStudentIdPlural(){
|
||||
return studentIdPlural;
|
||||
}
|
||||
public void setStudentIdPlural(String studentIdPlural){
|
||||
this.studentIdPlural = studentIdPlural;
|
||||
}
|
||||
public String getStudentHandsOnTaskLogJsonStr(){
|
||||
return studentHandsOnTaskLogJsonStr;
|
||||
}
|
||||
public void setStudentHandsOnTaskLogJsonStr(String studentHandsOnTaskLogJsonStr ){
|
||||
this.studentHandsOnTaskLogJsonStr = studentHandsOnTaskLogJsonStr;
|
||||
}
|
||||
public String get_given() {
|
||||
return _given;
|
||||
}
|
||||
public void set_given(String _given) {
|
||||
this._given = _given;
|
||||
}
|
||||
}
|
@ -0,0 +1,38 @@
|
||||
layui.define([ 'form', 'laydate', 'table','studentHandsOnTaskLogApi'], function(exports) {
|
||||
var form = layui.form;
|
||||
var studentHandsOnTaskLogApi = layui.studentHandsOnTaskLogApi;
|
||||
var index = layui.index;
|
||||
var view = {
|
||||
init:function(){
|
||||
Lib.initGenrealForm($("#addForm"),form);
|
||||
this.initSubmit();
|
||||
},
|
||||
initSubmit:function(){
|
||||
$("#addButton").click(function(){
|
||||
form.on('submit(form)', function(){
|
||||
var studentHandsOnTaskPptId = $("#addForm input[name='studentHandsOnTaskPptId']").val();
|
||||
if(!$.isEmpty(studentHandsOnTaskPptId)){
|
||||
studentHandsOnTaskLogApi.updateStudentHandsOnTaskLog($('#addForm'),function(){
|
||||
parent.window.dataReload();
|
||||
Common.info("更新成功");
|
||||
Lib.closeFrame();
|
||||
});
|
||||
}else{
|
||||
studentHandsOnTaskLogApi.addStudentHandsOnTaskLog($('#addForm'),function(){
|
||||
parent.window.dataReload();
|
||||
Common.info("添加成功");
|
||||
Lib.closeFrame();
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
$("#addButton-cancel").click(function(){
|
||||
Lib.closeFrame();
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
exports('add',view);
|
||||
});
|
@ -0,0 +1,23 @@
|
||||
layui.define(['table', 'studentHandsOnTaskLogApi'], function(exports) {
|
||||
var studentHandsOnTaskLogApi = layui.studentHandsOnTaskLogApi;
|
||||
var table=layui.table;
|
||||
var view = {
|
||||
init:function(){
|
||||
},
|
||||
delBatch:function(){
|
||||
var data = Common.getMoreDataFromTable(table,"studentHandsOnTaskLogTable");
|
||||
if(data==null){
|
||||
return ;
|
||||
}
|
||||
Common.openConfirm("确认要删除这些学生实操日志?",function(){
|
||||
var ids =Common.concatBatchId(data,"studentHandsOnTaskPptId");
|
||||
studentHandsOnTaskLogApi.del(ids,function(){
|
||||
Common.info("删除成功");
|
||||
dataReload();
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
exports('del',view);
|
||||
|
||||
});
|
@ -0,0 +1,28 @@
|
||||
layui.define([ 'form', 'laydate', 'table','studentHandsOnTaskLogApi'], function(exports) {
|
||||
var form = layui.form;
|
||||
var studentHandsOnTaskLogApi = layui.studentHandsOnTaskLogApi;
|
||||
var index = layui.index;
|
||||
var view = {
|
||||
init:function(){
|
||||
Lib.initGenrealForm($("#updateForm"),form);
|
||||
this.initSubmit();
|
||||
},
|
||||
initSubmit:function(){
|
||||
$("#updateButton").click(function(){
|
||||
form.on('submit(form)', function(){
|
||||
studentHandsOnTaskLogApi.updateStudentHandsOnTaskLog($('#updateForm'),function(){
|
||||
parent.window.dataReload();
|
||||
Common.info("更新成功");
|
||||
Lib.closeFrame();
|
||||
});
|
||||
});
|
||||
});
|
||||
$("#updateButton-cancel").click(function(){
|
||||
Lib.closeFrame();
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
exports('edit',view);
|
||||
|
||||
});
|
@ -0,0 +1,18 @@
|
||||
/*访问后台的代码*/
|
||||
layui.define([], function(exports) {
|
||||
var api={
|
||||
updateStudentHandsOnTaskLog:function(form,callback){
|
||||
Lib.submitForm("/jlw/studentHandsOnTaskLog/edit.json",form,{},callback)
|
||||
},
|
||||
addStudentHandsOnTaskLog:function(form,callback){
|
||||
Lib.submitForm("/jlw/studentHandsOnTaskLog/add.json",form,{},callback)
|
||||
},
|
||||
del:function(ids,callback){
|
||||
Common.post("/jlw/studentHandsOnTaskLog/delete.json",{"ids":ids},function(){
|
||||
callback();
|
||||
})
|
||||
}
|
||||
|
||||
};
|
||||
exports('studentHandsOnTaskLogApi',api);
|
||||
});
|
@ -0,0 +1,29 @@
|
||||
<!--#layout("/common/layout.html",{"jsBase":"/js/jlw/studentHandsOnTaskLog/"}){ -->
|
||||
<layui:searchForm formId="searchForm" searchList="" condition="${search}">
|
||||
</layui:searchForm>
|
||||
<table id="studentHandsOnTaskLogTable" lay-filter="studentHandsOnTaskLogTable"></table>
|
||||
<!--#} -->
|
||||
|
||||
<script type="text/html" id="toolbar_studentHandsOnTaskLog">
|
||||
<div class="layui-btn-container">
|
||||
<div class="layui-btn-group" >
|
||||
<!--# if(core.searchIsShow(search)) {-->
|
||||
<layui:accessButton function="studentHandsOnTaskLog.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton>
|
||||
<!--# }-->
|
||||
<layui:accessButton function="studentHandsOnTaskLog.add" action="add">添加</layui:accessButton>
|
||||
<layui:accessButton function="studentHandsOnTaskLog.edit" action="edit">修改</layui:accessButton>
|
||||
<layui:accessButton function="studentHandsOnTaskLog.del" action="del">删除</layui:accessButton>
|
||||
<!--# if(!isEmpty(search)) {-->
|
||||
<layui:accessButton function="studentHandsOnTaskLog.query" action="refresh"><i class="layui-icon"></i>刷新</layui:accessButton>
|
||||
<!--# }-->
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
<script>
|
||||
|
||||
layui.use(['index'], function(){
|
||||
var index = layui.index;
|
||||
index.init();
|
||||
});
|
||||
|
||||
</script>
|
Loading…
Reference in New Issue