From bb3410cc338707300dd0f00650a2a94769f7c475 Mon Sep 17 00:00:00 2001 From: xuliangtong <1124839262@qq.com> Date: Sat, 24 Sep 2022 23:28:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AE=9E=E6=93=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=AE=9E=E8=AE=AD=E8=A7=82=E7=9C=8B=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E3=80=81=E8=A7=82=E7=9C=8BPPT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/mysql/tianze-pro-update.sql | 5 + .../jlw/dao/HandsOnSimulationTasksDao.java | 27 ++ .../java/com/ibeetl/jlw/entity/HandsOn.java | 39 ++ .../jlw/entity/HandsOnSimulationTasks.java | 249 +++++++++++++ .../HandsOnSimulationTasksService.java | 163 ++++++++ .../com/ibeetl/jlw/web/HandsOnController.java | 3 + .../web/HandsOnSimulationTasksController.java | 223 +++++++++++ .../ibeetl/jlw/web/query/HandsOnQuery.java | 43 +++ .../query/HandsOnSimulationTasksQuery.java | 189 ++++++++++ web/src/main/resources/application.properties | 2 +- .../sql/jlw/handsOnSimulationTasks.md | 352 ++++++++++++++++++ .../resources/static/js/jlw/handsOn/add.js | 8 +- .../js/jlw/handsOnSimulationTasks/add.js | 71 ++++ .../js/jlw/handsOnSimulationTasks/del.js | 23 ++ .../js/jlw/handsOnSimulationTasks/edit.js | 28 ++ .../handsOnSimulationTasksApi.js | 18 + .../js/jlw/handsOnSimulationTasks/index.js | 213 +++++++++++ .../resources/templates/jlw/handsOn/add.html | 15 +- .../jlw/handsOnSimulationTasks/add.html | 240 ++++++++++++ .../jlw/handsOnSimulationTasks/edit.html | 110 ++++++ .../jlw/handsOnSimulationTasks/index.html | 29 ++ 21 files changed, 2041 insertions(+), 9 deletions(-) create mode 100644 web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksDao.java create mode 100644 web/src/main/java/com/ibeetl/jlw/entity/HandsOnSimulationTasks.java create mode 100644 web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java create mode 100644 web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java create mode 100644 web/src/main/java/com/ibeetl/jlw/web/query/HandsOnSimulationTasksQuery.java create mode 100644 web/src/main/resources/sql/jlw/handsOnSimulationTasks.md create mode 100644 web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js create mode 100644 web/src/main/resources/static/js/jlw/handsOnSimulationTasks/del.js create mode 100644 web/src/main/resources/static/js/jlw/handsOnSimulationTasks/edit.js create mode 100644 web/src/main/resources/static/js/jlw/handsOnSimulationTasks/handsOnSimulationTasksApi.js create mode 100644 web/src/main/resources/static/js/jlw/handsOnSimulationTasks/index.js create mode 100644 web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html create mode 100644 web/src/main/resources/templates/jlw/handsOnSimulationTasks/edit.html create mode 100644 web/src/main/resources/templates/jlw/handsOnSimulationTasks/index.html diff --git a/doc/sql/mysql/tianze-pro-update.sql b/doc/sql/mysql/tianze-pro-update.sql index 067b52c0..75852bf2 100644 --- a/doc/sql/mysql/tianze-pro-update.sql +++ b/doc/sql/mysql/tianze-pro-update.sql @@ -69,3 +69,8 @@ create table resources_question_snapshot COLLATE = utf8_general_ci; alter table resources_question_snapshot comment '资源管理 - 题库管理-快照-关联来源'; + +ALTER TABLE hands_on ADD COLUMN add_time datetime COMMENT '添加时间'; +ALTER TABLE hands_on ADD COLUMN org_id bigint(20) COMMENT '组织机构ID'; +ALTER TABLE hands_on ADD COLUMN user_id bigint(20) COMMENT '后台用户ID'; +ALTER TABLE hands_on ADD COLUMN training_data VARCHAR(1000) COMMENT '数据集（多个地址，逗号隔开）'; diff --git a/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksDao.java b/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksDao.java new file mode 100644 index 00000000..b48f2213 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksDao.java @@ -0,0 +1,27 @@ +package com.ibeetl.jlw.dao; + +import java.util.List; +import java.util.Map; + +import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.web.query.HandsOnSimulationTasksQuery; + +import org.beetl.sql.mapper.annotation.SqlResource; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.core.engine.PageQuery; +import org.beetl.sql.mapper.annotation.Update; + +/** + * HandsOnSimulationTasks Dao + */ +@SqlResource("jlw.handsOnSimulationTasks") +public interface HandsOnSimulationTasksDao extends BaseMapper{ + PageQuery queryByCondition(PageQuery query); + PageQuery queryByConditionQuery(PageQuery query); + @Update + void deleteHandsOnSimulationTasksByIds(String ids); + @Update + int updateGivenByIds(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery); + List getByIds(String ids); + List getValuesByQuery(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery); +} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java b/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java index 272fc2d7..0fca8a3e 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java @@ -2,6 +2,7 @@ package com.ibeetl.jlw.entity; import javax.validation.constraints.NotNull; +import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.entity.BaseEntity; import org.beetl.sql.annotation.entity.*; @@ -40,6 +41,44 @@ public class HandsOn extends BaseEntity{ //实操介绍 private String handsOnRecommend ; + + private Date addTime; + private Long orgId; + + public Date getAddTime() { + return addTime; + } + + public void setAddTime(Date addTime) { + this.addTime = addTime; + } + + 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 String getTrainingData() { + return trainingData; + } + + public void setTrainingData(String trainingData) { + this.trainingData = trainingData; + } + + private Long userId; + private String trainingData; public HandsOn(){ } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/HandsOnSimulationTasks.java b/web/src/main/java/com/ibeetl/jlw/entity/HandsOnSimulationTasks.java new file mode 100644 index 00000000..646a5baa --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/HandsOnSimulationTasks.java @@ -0,0 +1,249 @@ +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-09-24 +*/ +public class HandsOnSimulationTasks extends BaseEntity{ + + //实训任务id + @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) + @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.HandsOnSimulationTasks") + + private Long taskId ; + + //实操id(关联主表) + + private Long handsOnId ; + + //任务类型 + + private String taskType ; + + //任务标题 + + private String taskTitle ; + + //任务分值 + + private String taskScore ; + + //任务顺序 + + private String taskOrder ; + + //任务状态 + + private String taskStatus ; + + //考核要求(A,B, + + private String assessmentRequirements ; + + //考核时间分钟(考核要求AC必填) + + private String assessmentTime ; + + //考核内容 + + private String assessmentContent ; + + //组织机构ID + + private Long orgId ; + + //后台用户ID + + private Long userId ; + + //添加时间 + + private Date addTime ; + + public HandsOnSimulationTasks(){ + } + + /**实训任务id + *@return + */ + public Long getTaskId(){ + return taskId; + } + /**实训任务id + *@param taskId + */ + public void setTaskId(Long taskId){ + this.taskId = taskId; + } + + /**实操id(关联主表) + *@return + */ + public Long getHandsOnId(){ + return handsOnId; + } + /**实操id(关联主表) + *@param handsOnId + */ + public void setHandsOnId(Long handsOnId){ + this.handsOnId = handsOnId; + } + + /**任务类型 + *@return + */ + public String getTaskType(){ + return taskType; + } + /**任务类型 + *@param taskType + */ + public void setTaskType(String taskType){ + this.taskType = taskType; + } + + /**任务标题 + *@return + */ + public String getTaskTitle(){ + return taskTitle; + } + /**任务标题 + *@param taskTitle + */ + public void setTaskTitle(String taskTitle){ + this.taskTitle = taskTitle; + } + + /**任务分值 + *@return + */ + public String getTaskScore(){ + return taskScore; + } + /**任务分值 + *@param taskScore + */ + public void setTaskScore(String taskScore){ + this.taskScore = taskScore; + } + + /**任务顺序 + *@return + */ + public String getTaskOrder(){ + return taskOrder; + } + /**任务顺序 + *@param taskOrder + */ + public void setTaskOrder(String taskOrder){ + this.taskOrder = taskOrder; + } + + /**任务状态 + *@return + */ + public String getTaskStatus(){ + return taskStatus; + } + /**任务状态 + *@param taskStatus + */ + public void setTaskStatus(String taskStatus){ + this.taskStatus = taskStatus; + } + + /**考核要求(A,B, + *@return + */ + public String getAssessmentRequirements(){ + return assessmentRequirements; + } + /**考核要求(A,B, + *@param assessmentRequirements + */ + public void setAssessmentRequirements(String assessmentRequirements){ + this.assessmentRequirements = assessmentRequirements; + } + + /**考核时间分钟(考核要求AC必填) + *@return + */ + public String getAssessmentTime(){ + return assessmentTime; + } + /**考核时间分钟(考核要求AC必填) + *@param assessmentTime + */ + public void setAssessmentTime(String assessmentTime){ + this.assessmentTime = assessmentTime; + } + + /**考核内容 + *@return + */ + public String getAssessmentContent(){ + return assessmentContent; + } + /**考核内容 + *@param assessmentContent + */ + public void setAssessmentContent(String assessmentContent){ + this.assessmentContent = assessmentContent; + } + + /**组织机构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 getAddTime(){ + return addTime; + } + /**添加时间 + *@param addTime + */ + public void setAddTime(Date addTime){ + this.addTime = addTime; + } + + +} diff --git a/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java b/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java new file mode 100644 index 00000000..cdf71945 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java @@ -0,0 +1,163 @@ +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.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.HandsOnSimulationTasksDao; +import com.ibeetl.jlw.entity.HandsOnSimulationTasks; +import com.ibeetl.jlw.web.query.HandsOnSimulationTasksQuery; +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 javax.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; + +/** + * HandsOnSimulationTasks Service + * 当分布式ID开启后请勿使用insert(*,true) + */ + +@Service +@Transactional +public class HandsOnSimulationTasksService extends CoreBaseService{ + + @Resource private HandsOnSimulationTasksDao handsOnSimulationTasksDao; + + public PageQueryqueryByCondition(PageQuery query){ + PageQuery ret = handsOnSimulationTasksDao.queryByCondition(query); + queryListAfter(ret.getList()); + return ret; + } + + public PageQueryqueryByConditionQuery(PageQuery query){ + PageQuery ret = handsOnSimulationTasksDao.queryByConditionQuery(query); + queryListAfter(ret.getList()); + return ret; + } + + public void deleteByList(List list){ + String ids = ""; + ToolUtils.deleteNullList(list); + for(int i=0;null != list && i handsOnSimulationTasksList = new ArrayList<>(); + try { + handsOnSimulationTasksList = JSON.parseArray(handsOnSimulationTasksQuery.getHandsOnSimulationTasksJsonStr(), HandsOnSimulationTasks.class); + } catch (Exception e) { + try { + handsOnSimulationTasksList.add(JSONObject.parseObject(handsOnSimulationTasksQuery.getHandsOnSimulationTasksJsonStr(), HandsOnSimulationTasks.class)); + } catch (Exception e1) {} + } + ToolUtils.deleteNullList(handsOnSimulationTasksList); + if(null != handsOnSimulationTasksList && handsOnSimulationTasksList.size()>0){ + for(int i=0;i 0; + if(!flag){ + msg = "更新指定参数失败"; + } + }else{ + msg = "指定参数为空"; + } + return msg; + } + + public List getValues (Object paras){ + return sqlManager.select(SqlId.of("jlw.handsOnSimulationTasks.getHandsOnSimulationTasksValues"), HandsOnSimulationTasks.class, paras); + } + + public List getValuesByQuery (HandsOnSimulationTasksQuery handsOnSimulationTasksQuery){ + return handsOnSimulationTasksDao.getValuesByQuery(handsOnSimulationTasksQuery); + } + + public HandsOnSimulationTasks getInfo (Long taskId){ + HandsOnSimulationTasksQuery handsOnSimulationTasksQuery = new HandsOnSimulationTasksQuery(); + handsOnSimulationTasksQuery.setTaskId(taskId); + List list = handsOnSimulationTasksDao.getValuesByQuery(handsOnSimulationTasksQuery); + if(null != list && list.size()>0){ + return list.get(0); + }else{ + return null; + } + } + + public HandsOnSimulationTasks getInfo (HandsOnSimulationTasksQuery handsOnSimulationTasksQuery){ + List list = handsOnSimulationTasksDao.getValuesByQuery(handsOnSimulationTasksQuery); + if(null != list && list.size()>0){ + return list.get(0); + }else{ + return null; + } + } + +} diff --git a/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java b/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java index c604eb34..28e01ff7 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java @@ -174,6 +174,9 @@ public class HandsOnController{ if(result.hasErrors()){ return JsonResult.failMessage(result); }else{ + handsOnQuery.setAddTime(new Date()); + handsOnQuery.setOrgId(coreUser.getOrgId()); + handsOnQuery.setUserId(coreUser.getId()); return handsOnService.add(handsOnQuery); } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java b/web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java new file mode 100644 index 00000000..dd94dacb --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java @@ -0,0 +1,223 @@ +package com.ibeetl.jlw.web; + +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.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 javax.annotation.Resource; +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 javax.annotation.Resource; + +/** + * HandsOnSimulationTasks 课程实操-实训任务 接口 + * 切记不要对非线程安全的静态变量进行写操作 + */ + +@RestController +public class HandsOnSimulationTasksController{ + + private final Log log = LogFactory.getLog(this.getClass()); + private static final String MODEL = "/jlw/handsOnSimulationTasks"; + private static final String API = "/api/handsOnSimulationTasks"; + + + @Resource private HandsOnSimulationTasksService handsOnSimulationTasksService; + + @Resource FileService fileService; + + /* 前端接口 */ + + @PostMapping(API + "/getPageList.do") + public JsonResult getPageList(HandsOnSimulationTasksQuery condition,@SCoreUser CoreUser coreUser){ + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + PageQuery page = condition.getPageQuery(); + handsOnSimulationTasksService.queryByConditionQuery(page); + return JsonResult.success(page); + } + } + + + @GetMapping(API + "/getInfo.do") + public JsonResultgetInfo(HandsOnSimulationTasksQuery param,@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + HandsOnSimulationTasks handsOnSimulationTasks = handsOnSimulationTasksService.getInfo(param); + return JsonResult.success(handsOnSimulationTasks); + } + } + + + @GetMapping(API + "/getList.do") + public JsonResult>getList(HandsOnSimulationTasksQuery param,@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + Listlist = handsOnSimulationTasksService.getValuesByQuery(param); + return JsonResult.success(list); + } + } + + + /* 后台页面 */ + + @GetMapping(MODEL + "/index.do") + @Function("handsOnSimulationTasks.query") + public ModelAndView index() { + ModelAndView view = new ModelAndView("/jlw/handsOnSimulationTasks/index.html") ; + view.addObject("search", HandsOnSimulationTasksQuery.class.getName()); + return view; + } + + @GetMapping(MODEL + "/edit.do") + @Function("handsOnSimulationTasks.edit") + public ModelAndView edit(Long taskId) { + ModelAndView view = new ModelAndView("/jlw/handsOnSimulationTasks/edit.html"); + HandsOnSimulationTasks handsOnSimulationTasks = handsOnSimulationTasksService.queryById(taskId); + view.addObject("handsOnSimulationTasks", handsOnSimulationTasks); + return view; + } + + @GetMapping(MODEL + "/add.do") + @Function("handsOnSimulationTasks.add") + public ModelAndView add(Long taskId) { + ModelAndView view = new ModelAndView("/jlw/handsOnSimulationTasks/add.html"); + if(null != taskId){ + HandsOnSimulationTasks handsOnSimulationTasks = handsOnSimulationTasksService.queryById(taskId); + view.addObject("handsOnSimulationTasks", handsOnSimulationTasks); + }else { + view.addObject("handsOnSimulationTasks", new HandsOnSimulationTasks()); + } + return view; + } + + /* 后台接口 */ + + @PostMapping(MODEL + "/list.json") + @Function("handsOnSimulationTasks.query") + public JsonResult list(HandsOnSimulationTasksQuery condition){ + PageQuery page = condition.getPageQuery(); + handsOnSimulationTasksService.queryByCondition(page); + return JsonResult.success(page); + } + + @PostMapping(MODEL + "/addAll.json") + @Function("handsOnSimulationTasks.add") + public JsonResult addAll(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery,@SCoreUser CoreUser coreUser){ + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + handsOnSimulationTasksQuery.setUserId(coreUser.getId()); + handsOnSimulationTasksQuery.setOrgId(coreUser.getOrgId()); + String msg = handsOnSimulationTasksService.addAll(handsOnSimulationTasksQuery); + if (StringUtils.isBlank(msg)) { + return JsonResult.success(); + } else { + return JsonResult.failMessage("新增失败,"+msg); + } + } + } + + @PostMapping(MODEL + "/add.json") + @Function("handsOnSimulationTasks.add") + public JsonResult add(@Validated(ValidateConfig.ADD.class) HandsOnSimulationTasksQuery handsOnSimulationTasksQuery, BindingResult result,@SCoreUser CoreUser coreUser){ + if(result.hasErrors()){ + return JsonResult.failMessage(result); + }else{ + handsOnSimulationTasksQuery.setUserId(coreUser.getId()); + handsOnSimulationTasksQuery.setOrgId(coreUser.getOrgId()); + return handsOnSimulationTasksService.add(handsOnSimulationTasksQuery); + } + } + + @PostMapping(MODEL + "/edit.json") + @Function("handsOnSimulationTasks.edit") + public JsonResult update(@Validated(ValidateConfig.UPDATE.class) HandsOnSimulationTasksQuery handsOnSimulationTasksQuery, BindingResult result) { + if(result.hasErrors()){ + return JsonResult.failMessage(result); + }else { + handsOnSimulationTasksQuery.setUserId(null); + handsOnSimulationTasksQuery.setOrgId(null); + String msg = handsOnSimulationTasksService.edit(handsOnSimulationTasksQuery); + if (StringUtils.isBlank(msg)) { + return JsonResult.success(); + } else { + return JsonResult.failMessage("更新失败,"+msg); + } + } + } + + + @GetMapping(MODEL + "/view.json") + @Function("handsOnSimulationTasks.query") + public JsonResultqueryInfo(Long taskId) { + HandsOnSimulationTasks handsOnSimulationTasks = handsOnSimulationTasksService.queryById( taskId); + return JsonResult.success(handsOnSimulationTasks); + } + + @GetMapping(MODEL + "/getValues.json") + @Function("handsOnSimulationTasks.query") + public JsonResult>getValues(HandsOnSimulationTasksQuery param) { + Listlist = handsOnSimulationTasksService.getValuesByQuery(param); + return JsonResult.success(list); + } + + + @PostMapping(MODEL + "/delete.json") + @Function("handsOnSimulationTasks.delete") + @ResponseBody + public JsonResult delete(String ids) { + handsOnSimulationTasksService.deleteHandsOnSimulationTasks(ids); + return JsonResult.success(); + } + + +} diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java index f2371eca..8ab1703e 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java @@ -27,7 +27,46 @@ public class HandsOnQuery extends PageParam { private String handsOnName; @Query(name = "实操介绍", display = false) private String handsOnRecommend; + @Query(name = "添加时间", display = false) + private Date addTime; + @Query(name = "组织机构ID", display = false) + private Long orgId; + @Query(name = "后台用户ID", display = false) + private Long userId; + @Query(name = "数据集", display = false) + private String trainingData; + public Date getAddTime() { + return addTime; + } + + public void setAddTime(Date addTime) { + this.addTime = addTime; + } + + 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 String getTrainingData() { + return trainingData; + } + + public void setTrainingData(String trainingData) { + this.trainingData = trainingData; + } private String handsOnJsonStr;//json格式 @@ -71,6 +110,10 @@ public class HandsOnQuery extends PageParam { pojo.setCourseChildNode(this.getCourseChildNode()); pojo.setHandsOnName(this.getHandsOnName()); pojo.setHandsOnRecommend(this.getHandsOnRecommend()); + pojo.setAddTime(this.getAddTime()); + pojo.setOrgId(this.getOrgId()); + pojo.setUserId(this.getUserId()); + pojo.setTrainingData(this.getTrainingData()); return pojo; } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnSimulationTasksQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnSimulationTasksQuery.java new file mode 100644 index 00000000..5337f28d --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnSimulationTasksQuery.java @@ -0,0 +1,189 @@ +package com.ibeetl.jlw.web.query; + +import cn.jlw.validate.ValidateConfig; +import com.ibeetl.jlw.entity.HandsOnSimulationTasks; +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; + +/** + *HandsOnSimulationTasks查询 + */ +public class HandsOnSimulationTasksQuery extends PageParam { + @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) + @Query(name = "实训任务id", display = false) + private Long taskId; + @Query(name = "实操id(关联主表)", display = false) + private Long handsOnId; + @Query(name = "任务类型", display = false) + private String taskType; + @Query(name = "任务标题", display = false) + private String taskTitle; + @Query(name = "任务分值", display = false) + private String taskScore; + @Query(name = "任务顺序", display = false) + private String taskOrder; + @Query(name = "任务状态", display = false) + private String taskStatus; + @Query(name = "考核要求(A", display = false) + private String assessmentRequirements; + @Query(name = "考核时间分钟(考核要求AC必填)", display = false) + private String assessmentTime; + @Query(name = "考核内容", display = false) + private String assessmentContent; + @Query(name = "组织机构ID", display = false) + private Long orgId; + @Query(name = "后台用户ID", display = false) + private Long userId; + @Query(name = "添加时间", display = false) + private Date addTime; + + private String taskIdPlural; + private String handsOnIdPlural; + private String orgIdPlural; + private String userIdPlural; + + private String handsOnSimulationTasksJsonStr;//json格式 + + private String _given;//指定更新的特定字段，多个逗号隔开 + + public Long getTaskId(){ + return taskId; + } + public void setTaskId(Long taskId ){ + this.taskId = taskId; + } + public Long getHandsOnId(){ + return handsOnId; + } + public void setHandsOnId(Long handsOnId ){ + this.handsOnId = handsOnId; + } + public String getTaskType(){ + return taskType; + } + public void setTaskType(String taskType ){ + this.taskType = taskType; + } + public String getTaskTitle(){ + return taskTitle; + } + public void setTaskTitle(String taskTitle ){ + this.taskTitle = taskTitle; + } + public String getTaskScore(){ + return taskScore; + } + public void setTaskScore(String taskScore ){ + this.taskScore = taskScore; + } + public String getTaskOrder(){ + return taskOrder; + } + public void setTaskOrder(String taskOrder ){ + this.taskOrder = taskOrder; + } + public String getTaskStatus(){ + return taskStatus; + } + public void setTaskStatus(String taskStatus ){ + this.taskStatus = taskStatus; + } + public String getAssessmentRequirements(){ + return assessmentRequirements; + } + public void setAssessmentRequirements(String assessmentRequirements ){ + this.assessmentRequirements = assessmentRequirements; + } + public String getAssessmentTime(){ + return assessmentTime; + } + public void setAssessmentTime(String assessmentTime ){ + this.assessmentTime = assessmentTime; + } + public String getAssessmentContent(){ + return assessmentContent; + } + public void setAssessmentContent(String assessmentContent ){ + this.assessmentContent = assessmentContent; + } + 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 getAddTime(){ + return addTime; + } + public void setAddTime(Date addTime ){ + this.addTime = addTime; + } + + public HandsOnSimulationTasks pojo(){ + HandsOnSimulationTasks pojo = new HandsOnSimulationTasks(); + pojo.setTaskId(this.getTaskId()); + pojo.setHandsOnId(this.getHandsOnId()); + pojo.setTaskType(this.getTaskType()); + pojo.setTaskTitle(this.getTaskTitle()); + pojo.setTaskScore(this.getTaskScore()); + pojo.setTaskOrder(this.getTaskOrder()); + pojo.setTaskStatus(this.getTaskStatus()); + pojo.setAssessmentRequirements(this.getAssessmentRequirements()); + pojo.setAssessmentTime(this.getAssessmentTime()); + pojo.setAssessmentContent(this.getAssessmentContent()); + pojo.setOrgId(this.getOrgId()); + pojo.setUserId(this.getUserId()); + pojo.setAddTime(this.getAddTime()); + return pojo; + } + + public String getTaskIdPlural(){ + return taskIdPlural; + } + public void setTaskIdPlural(String taskIdPlural){ + this.taskIdPlural = taskIdPlural; + } + public String getHandsOnIdPlural(){ + return handsOnIdPlural; + } + public void setHandsOnIdPlural(String handsOnIdPlural){ + this.handsOnIdPlural = handsOnIdPlural; + } + 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 getHandsOnSimulationTasksJsonStr(){ + return handsOnSimulationTasksJsonStr; + } + public void setHandsOnSimulationTasksJsonStr(String handsOnSimulationTasksJsonStr ){ + this.handsOnSimulationTasksJsonStr = handsOnSimulationTasksJsonStr; + } + public String get_given() { + return _given; + } + public void set_given(String _given) { + this._given = _given; + } +} diff --git a/web/src/main/resources/application.properties b/web/src/main/resources/application.properties index ded2a6e3..05d54a94 100644 --- a/web/src/main/resources/application.properties +++ b/web/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.profiles.active=dev +spring.profiles.active=local #spring.profiles.active=local m3u8.ffmpegPath=D:/ diff --git a/web/src/main/resources/sql/jlw/handsOnSimulationTasks.md b/web/src/main/resources/sql/jlw/handsOnSimulationTasks.md new file mode 100644 index 00000000..2ba78677 --- /dev/null +++ b/web/src/main/resources/sql/jlw/handsOnSimulationTasks.md @@ -0,0 +1,352 @@ +queryByCondition +=== +* 根据不为空的参数进行分页查询 + + select + @pageTag(){ + t.* + @} + from hands_on_simulation_tasks t + where 1=1 + @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行 + and #function("handsOnSimulationTasks.query")# + @if(!isEmpty(taskId)){ + and t.task_id =#taskId# + @} + @if(!isEmpty(taskIdPlural)){ + and find_in_set(t.task_id,#taskIdPlural#) + @} + @if(!isEmpty(handsOnId)){ + and t.hands_on_id =#handsOnId# + @} + @if(!isEmpty(handsOnIdPlural)){ + and find_in_set(t.hands_on_id,#handsOnIdPlural#) + @} + @if(!isEmpty(taskType)){ + and t.task_type =#taskType# + @} + @if(!isEmpty(taskTitle)){ + and t.task_title =#taskTitle# + @} + @if(!isEmpty(taskScore)){ + and t.task_score =#taskScore# + @} + @if(!isEmpty(taskOrder)){ + and t.task_order =#taskOrder# + @} + @if(!isEmpty(taskStatus)){ + and t.task_status =#taskStatus# + @} + @if(!isEmpty(assessmentRequirements)){ + and t.assessment_requirements =#assessmentRequirements# + @} + @if(!isEmpty(assessmentTime)){ + and t.assessment_time =#assessmentTime# + @} + @if(!isEmpty(assessmentContent)){ + and t.assessment_content =#assessmentContent# + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(orgIdPlural)){ + and find_in_set(t.org_id,#orgIdPlural#) + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + @if(!isEmpty(userIdPlural)){ + and find_in_set(t.user_id,#userIdPlural#) + @} + @if(!isEmpty(addTime)){ + and t.add_time =#addTime# + @} + + +queryByConditionQuery +=== +* 根据不为空的参数进行分页查询(无权限) + + select + @pageTag(){ + t.* + @} + from hands_on_simulation_tasks t + where 1=1 + @if(!isEmpty(taskId)){ + and t.task_id =#taskId# + @} + @if(!isEmpty(taskIdPlural)){ + and find_in_set(t.task_id,#taskIdPlural#) + @} + @if(!isEmpty(handsOnId)){ + and t.hands_on_id =#handsOnId# + @} + @if(!isEmpty(handsOnIdPlural)){ + and find_in_set(t.hands_on_id,#handsOnIdPlural#) + @} + @if(!isEmpty(taskType)){ + and t.task_type =#taskType# + @} + @if(!isEmpty(taskTitle)){ + and t.task_title =#taskTitle# + @} + @if(!isEmpty(taskScore)){ + and t.task_score =#taskScore# + @} + @if(!isEmpty(taskOrder)){ + and t.task_order =#taskOrder# + @} + @if(!isEmpty(taskStatus)){ + and t.task_status =#taskStatus# + @} + @if(!isEmpty(assessmentRequirements)){ + and t.assessment_requirements =#assessmentRequirements# + @} + @if(!isEmpty(assessmentTime)){ + and t.assessment_time =#assessmentTime# + @} + @if(!isEmpty(assessmentContent)){ + and t.assessment_content =#assessmentContent# + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(orgIdPlural)){ + and find_in_set(t.org_id,#orgIdPlural#) + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + @if(!isEmpty(userIdPlural)){ + and find_in_set(t.user_id,#userIdPlural#) + @} + @if(!isEmpty(addTime)){ + and t.add_time =#addTime# + @} + + + + +deleteHandsOnSimulationTasksByIds +=== + +* 批量删除 + + delete from hands_on_simulation_tasks where find_in_set(task_id,#ids#) + + + +getByIds +=== + +select * from hands_on_simulation_tasks where find_in_set(task_id,#ids#) + + +updateGivenByIds +=== + +* 批量更新指定字段，无论此字段是否有值 + + update hands_on_simulation_tasks + set + @if(contain("handsOnId",_given)){ + @if(isEmpty(handsOnId)){ + hands_on_id = null , + @}else{ + hands_on_id = #handsOnId# , + @} + @} + @if(contain("taskType",_given)){ + @if(isEmpty(taskType)){ + task_type = null , + @}else{ + task_type = #taskType# , + @} + @} + @if(contain("taskTitle",_given)){ + @if(isEmpty(taskTitle)){ + task_title = null , + @}else{ + task_title = #taskTitle# , + @} + @} + @if(contain("taskScore",_given)){ + @if(isEmpty(taskScore)){ + task_score = null , + @}else{ + task_score = #taskScore# , + @} + @} + @if(contain("taskOrder",_given)){ + @if(isEmpty(taskOrder)){ + task_order = null , + @}else{ + task_order = #taskOrder# , + @} + @} + @if(contain("taskStatus",_given)){ + @if(isEmpty(taskStatus)){ + task_status = null , + @}else{ + task_status = #taskStatus# , + @} + @} + @if(contain("assessmentRequirements",_given)){ + @if(isEmpty(assessmentRequirements)){ + assessment_requirements = null , + @}else{ + assessment_requirements = #assessmentRequirements# , + @} + @} + @if(contain("assessmentTime",_given)){ + @if(isEmpty(assessmentTime)){ + assessment_time = null , + @}else{ + assessment_time = #assessmentTime# , + @} + @} + @if(contain("assessmentContent",_given)){ + @if(isEmpty(assessmentContent)){ + assessment_content = null , + @}else{ + assessment_content = #assessmentContent# , + @} + @} + @if(contain("orgId",_given)){ + @if(isEmpty(orgId)){ + org_id = null , + @}else{ + org_id = #orgId# , + @} + @} + @if(contain("userId",_given)){ + @if(isEmpty(userId)){ + user_id = null , + @}else{ + user_id = #userId# , + @} + @} + @if(contain("addTime",_given)){ + @if(isEmpty(addTime)){ + add_time = null , + @}else{ + add_time = #addTime# , + @} + @} + task_id = task_id + where find_in_set(task_id,#taskIdPlural#) + + + +getHandsOnSimulationTasksValues +=== + +* 根据不为空的参数进行查询 + + select t.* + from hands_on_simulation_tasks t + where 1=1 + @if(!isEmpty(taskId)){ + and t.task_id =#taskId# + @} + @if(!isEmpty(handsOnId)){ + and t.hands_on_id =#handsOnId# + @} + @if(!isEmpty(taskType)){ + and t.task_type =#taskType# + @} + @if(!isEmpty(taskTitle)){ + and t.task_title =#taskTitle# + @} + @if(!isEmpty(taskScore)){ + and t.task_score =#taskScore# + @} + @if(!isEmpty(taskOrder)){ + and t.task_order =#taskOrder# + @} + @if(!isEmpty(taskStatus)){ + and t.task_status =#taskStatus# + @} + @if(!isEmpty(assessmentRequirements)){ + and t.assessment_requirements =#assessmentRequirements# + @} + @if(!isEmpty(assessmentTime)){ + and t.assessment_time =#assessmentTime# + @} + @if(!isEmpty(assessmentContent)){ + and t.assessment_content =#assessmentContent# + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + @if(!isEmpty(addTime)){ + and t.add_time =#addTime# + @} + + +getValuesByQuery +=== + +* 根据不为空的参数进行查询 + + select t.* + from hands_on_simulation_tasks t + where 1=1 and #function("handsOnSimulationTasks.query")# + @if(!isEmpty(taskId)){ + and t.task_id =#taskId# + @} + @if(!isEmpty(taskIdPlural)){ + and find_in_set(t.task_id,#taskIdPlural#) + @} + @if(!isEmpty(handsOnId)){ + and t.hands_on_id =#handsOnId# + @} + @if(!isEmpty(handsOnIdPlural)){ + and find_in_set(t.hands_on_id,#handsOnIdPlural#) + @} + @if(!isEmpty(taskType)){ + and t.task_type =#taskType# + @} + @if(!isEmpty(taskTitle)){ + and t.task_title =#taskTitle# + @} + @if(!isEmpty(taskScore)){ + and t.task_score =#taskScore# + @} + @if(!isEmpty(taskOrder)){ + and t.task_order =#taskOrder# + @} + @if(!isEmpty(taskStatus)){ + and t.task_status =#taskStatus# + @} + @if(!isEmpty(assessmentRequirements)){ + and t.assessment_requirements =#assessmentRequirements# + @} + @if(!isEmpty(assessmentTime)){ + and t.assessment_time =#assessmentTime# + @} + @if(!isEmpty(assessmentContent)){ + and t.assessment_content =#assessmentContent# + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(orgIdPlural)){ + and find_in_set(t.org_id,#orgIdPlural#) + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + @if(!isEmpty(userIdPlural)){ + and find_in_set(t.user_id,#userIdPlural#) + @} + @if(!isEmpty(addTime)){ + and t.add_time =#addTime# + @} + + + diff --git a/web/src/main/resources/static/js/jlw/handsOn/add.js b/web/src/main/resources/static/js/jlw/handsOn/add.js index 914b074a..d22cf603 100644 --- a/web/src/main/resources/static/js/jlw/handsOn/add.js +++ b/web/src/main/resources/static/js/jlw/handsOn/add.js @@ -45,9 +45,9 @@ layui.define(['form', 'laydate', 'table','upload','layedit', 'handsOnApi'], func } }); if (!$.isEmpty(fileName) && !$.isEmpty(imgFile)) { - $("#addForm input[name='files']").val(imgFile + "||" + fileName); //写入form表单 + $("#addForm input[name='trainingData']").val(imgFile + "||" + fileName); //写入form表单 } else { - $("#addForm input[name='files']").val(""); //写入form表单 + $("#addForm input[name='trainingData']").val(""); //写入form表单 } var param = $("#addForm").serializeJson(); param.handsOnRecommend = layedit.getContent(one); @@ -80,5 +80,9 @@ layui.define(['form', 'laydate', 'table','upload','layedit', 'handsOnApi'], func form.on('select(select_courseInfoIds)', function (obj) { Lib.getCourseInfo($("select[name='courseChildNode']"), obj.value); }); + $(".button_add").click(() => { + var url = "/jlw/handsOnSimulationTasks/add.do"; + Common.openDlg(url,"实训任务管理>新增"); + }); exports('add', view); }); diff --git a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js new file mode 100644 index 00000000..90026da5 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js @@ -0,0 +1,71 @@ +layui.define([ 'form', 'laydate', 'table','element','handsOnSimulationTasksApi', 'upload'], function(exports) { + var form = layui.form; + var handsOnSimulationTasksApi = layui.handsOnSimulationTasksApi; + var index = layui.index; + var element = layui.element, upload = layui.upload + element.render(); +//普通图片上传 + var uploadInst = upload.render({ + elem: '#test-upload-normal' + ,url: '/upload/' + ,before: function(obj){ + //预读本地文件示例，不支持ie8 + obj.preview(function(index, file, result){ + $('#test-upload-normal-img').attr('src', result); //图片链接（base64） + }); + } + ,done: function(res){ + //如果上传失败 + if(res.code > 0){ + return layer.msg('上传失败'); + } + //上传成功 + } + ,error: function(){ + //演示失败状态，并实现重传 + var demoText = $('#test-upload-demoText'); + demoText.html('上传失败 重试'); + demoText.find('.demo-reload').on('click', function(){ + uploadInst.upload(); + }); + } + }); + + var view = { + init:function(){ + Lib.initGenrealForm($("#addForm"),form); + this.initSubmit(); + }, + initSubmit:function(){ + $("#addButton").click(function(){ + form.on('submit(form)', function(){ + var taskId = $("#addForm input[name='taskId']").val(); + if(!$.isEmpty(taskId)){ + handsOnSimulationTasksApi.updateHandsOnSimulationTasks($('#addForm'),function(){ + parent.window.dataReload(); + Common.info("更新成功"); + Lib.closeFrame(); + }); + }else{ + handsOnSimulationTasksApi.addHandsOnSimulationTasks($('#addForm'),function(){ + parent.window.dataReload(); + Common.info("添加成功"); + Lib.closeFrame(); + }); + } + + }); + }); + + $("#addButton-cancel").click(function(){ + Lib.closeFrame(); + }); + } + + } + + form.on('radio(taskType)', obj => { + element.tabChange('demo', obj.value); + }); + exports('add',view); +}); diff --git a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/del.js b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/del.js new file mode 100644 index 00000000..5ae14af5 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/del.js @@ -0,0 +1,23 @@ +layui.define(['table', 'handsOnSimulationTasksApi'], function(exports) { + var handsOnSimulationTasksApi = layui.handsOnSimulationTasksApi; + var table=layui.table; + var view = { + init:function(){ + }, + delBatch:function(){ + var data = Common.getMoreDataFromTable(table,"handsOnSimulationTasksTable"); + if(data==null){ + return ; + } + Common.openConfirm("确认要删除这些HandsOnSimulationTasks?",function(){ + var ids =Common.concatBatchId(data,"taskId"); + handsOnSimulationTasksApi.del(ids,function(){ + Common.info("删除成功"); + dataReload(); + }) + }) + } + } + exports('del',view); + +}); \ No newline at end of file diff --git a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/edit.js b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/edit.js new file mode 100644 index 00000000..d59cd2e3 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/edit.js @@ -0,0 +1,28 @@ +layui.define([ 'form', 'laydate', 'table','handsOnSimulationTasksApi'], function(exports) { + var form = layui.form; + var handsOnSimulationTasksApi = layui.handsOnSimulationTasksApi; + var index = layui.index; + var view = { + init:function(){ + Lib.initGenrealForm($("#updateForm"),form); + this.initSubmit(); + }, + initSubmit:function(){ + $("#updateButton").click(function(){ + form.on('submit(form)', function(){ + handsOnSimulationTasksApi.updateHandsOnSimulationTasks($('#updateForm'),function(){ + parent.window.dataReload(); + Common.info("更新成功"); + Lib.closeFrame(); + }); + }); + }); + $("#updateButton-cancel").click(function(){ + Lib.closeFrame(); + }); + } + + } + exports('edit',view); + +}); \ No newline at end of file diff --git a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/handsOnSimulationTasksApi.js b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/handsOnSimulationTasksApi.js new file mode 100644 index 00000000..618d7788 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/handsOnSimulationTasksApi.js @@ -0,0 +1,18 @@ +/*访问后台的代码*/ +layui.define([], function(exports) { + var api={ + updateHandsOnSimulationTasks:function(form,callback){ + Lib.submitForm("/jlw/handsOnSimulationTasks/edit.json",form,{},callback) + }, + addHandsOnSimulationTasks:function(form,callback){ + Lib.submitForm("/jlw/handsOnSimulationTasks/add.json",form,{},callback) + }, + del:function(ids,callback){ + Common.post("/jlw/handsOnSimulationTasks/delete.json",{"ids":ids},function(){ + callback(); + }) + } + + }; + exports('handsOnSimulationTasksApi',api); +}); \ No newline at end of file diff --git a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/index.js b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/index.js new file mode 100644 index 00000000..67d606aa --- /dev/null +++ b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/index.js @@ -0,0 +1,213 @@ +layui.define([ 'form', 'laydate', 'table' ], function(exports) { + var form = layui.form; + var laydate = layui.laydate; + var table = layui.table; + var handsOnSimulationTasksTable = null; + var view ={ + init:function(){ + var that = this + this.initTable(); + this.initSearchForm(); + this.initToolBar(); + window.dataReload = function(){ + Lib.doSearchForm($("#searchForm"),handsOnSimulationTasksTable) + that.initToolBar(); + } + }, + initTable:function(){ + var sx_ = localStorage.getItem("handsOnSimulationTasksTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存 + if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);} + handsOnSimulationTasksTable = table.render({ + elem : '#handsOnSimulationTasksTable', + height : Lib.getTableHeight(1), + cellMinWidth: 100, + method : 'post', + url : Common.ctxPath + '/jlw/handsOnSimulationTasks/list.json' // 数据接口 + ,page : Lib.tablePage // 开启分页 + ,toolbar: '#toolbar_handsOnSimulationTasks' //自定义头部左侧工具栏 + ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏 + ,limit : 10, + cols : [ [ // 表头 + { + type : 'checkbox', + + }, + { + field : 'taskId', + title : '实训任务id', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['taskId'])?false:sx_['taskId'], + + width : 60, + }, + { + field : 'handsOnId', + title : '实操id(关联主表)', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['handsOnId'])?false:sx_['handsOnId'], + }, + { + field : 'taskType', + title : '任务类型', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['taskType'])?false:sx_['taskType'], + }, + { + field : 'taskTitle', + title : '任务标题', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['taskTitle'])?false:sx_['taskTitle'], + }, + { + field : 'taskScore', + title : '任务分值', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['taskScore'])?false:sx_['taskScore'], + }, + { + field : 'taskOrder', + title : '任务顺序', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['taskOrder'])?false:sx_['taskOrder'], + }, + { + field : 'taskStatus', + title : '任务状态', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['taskStatus'])?false:sx_['taskStatus'], + }, + { + field : 'assessmentRequirements', + title : '考核要求(A', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['assessmentRequirements'])?false:sx_['assessmentRequirements'], + }, + { + field : 'assessmentTime', + title : '考核时间分钟(考核要求AC必填)', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['assessmentTime'])?false:sx_['assessmentTime'], + }, + { + field : 'assessmentContent', + title : '考核内容', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['assessmentContent'])?false:sx_['assessmentContent'], + }, + { + field : 'orgId', + title : '组织机构ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'], + }, + { + field : 'userId', + title : '后台用户ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['userId'])?false:sx_['userId'], + }, + { + field : 'addTime', + title : '添加时间', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['addTime'])?false:sx_['addTime'], + } + ,{ + field : 'operation_',title : '操作',align:"center", templet: function (d) { + var htm = ''; + htm += ''; + return htm; + } + } + + ] ] + + }); + + table.on('checkbox(handsOnSimulationTasksTable)', function(obj){ + var handsOnSimulationTasks = obj.data; + if(obj.checked){ + //按钮逻辑Lib.buttonEnable() + }else{ + + } + }) + }, + + initSearchForm:function(){ + Lib.initSearchForm( $("#searchForm"),handsOnSimulationTasksTable,form); + }, + + initToolBar:function(){ + toolbar = { + add: function () { + var url = "/jlw/handsOnSimulationTasks/add.do"; + Common.openDlg(url,"HandsOnSimulationTasks管理>新增"); + }, + edit: function () { + var data = Common.getOneFromTable(table,"handsOnSimulationTasksTable"); + if(data==null){ + return ; + } + var url = "/jlw/handsOnSimulationTasks/add.do?taskId="+data.taskId; + Common.openDlg(url,"HandsOnSimulationTasks管理>"+data.taskTitle+">编辑"); + }, + del: function () { + layui.use(['del'], function(){ + var delView = layui.del + delView.delBatch(); + }); + }, + search: function () { + Lib.doSearchForm($("#searchForm"), handsOnSimulationTasksTable, 1); + view.initToolBar() + }, + refresh: function () { + searchForm.reset(); + Lib.doSearchForm($("#searchForm"), handsOnSimulationTasksTable, 1); + view.initToolBar() + }, + } + //触发事件 + $('.ext-toolbar').on('click', function() { + var type = $(this).data('type'); + toolbar[type] ? toolbar[type].call(this) : ''; + }); + + }, initTableTool: table.on('tool(handsOnSimulationTasksTable)', function (obj) { + var data = obj.data; + if (obj.event === 'edit') { + var url = "/jlw/handsOnSimulationTasks/add.do?taskId="+data.taskId; + Common.openDlg(url,"HandsOnSimulationTasks管理>"+data.taskTitle+">编辑"); + }else if(obj.event === "del"){ + layer.confirm('是否确定删除该信息？', function (index) { + var ret = Common.postAjax("/jlw/handsOnSimulationTasks/delete.json",{ids:data.taskId}); + layer.msg(ret.code == 0?"删除成功！":ret.msg, { + offset: ['50%'], + icon: ret.code == 0?1:2, + time: 1500 //2秒关闭（如果不配置，默认是3秒） + },function (){ + if(ret.code == 0){ + Lib.tableRefresh(); + } + }); + }); + } + }) + } + exports('index',view); + +}); diff --git a/web/src/main/resources/templates/jlw/handsOn/add.html b/web/src/main/resources/templates/jlw/handsOn/add.html index 81e87ecb..baf2dd8d 100644 --- a/web/src/main/resources/templates/jlw/handsOn/add.html +++ b/web/src/main/resources/templates/jlw/handsOn/add.html @@ -76,8 +76,8 @@
- +
- - + + - ${fileName[i]} + ${fileName[i]} - 完成 @@ -121,7 +121,7 @@ - + @@ -137,6 +137,9 @@
+
+ +
diff --git a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html new file mode 100644 index 00000000..94c6f291 --- /dev/null +++ b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html @@ -0,0 +1,240 @@ + + + + +
+
+ +
+ + + + + +
+
+
+
+ +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+
+ +
+ +
+
+ 分钟 +
+
+
+ +
+
+ +
+ +
+
+ 分钟 +
+
+ + +
+
+
+
+
+
+
考核任务添加视频
+
+
+ +
+ +

+
+
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+
+ +
+ +
+
+ 分钟 +
+
+
+ +
+
+ +
+ +
+
+ 分钟 +
+
+
+
+
+
+
+
+
考核任务添加文档
+
+
+ +
+ +

+
+
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+
+ 实训步骤 +
+
+ 报告撰写 +
+
+
\ + + + + + + diff --git a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/edit.html b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/edit.html new file mode 100644 index 00000000..9da21300 --- /dev/null +++ b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/edit.html @@ -0,0 +1,110 @@ + + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + + diff --git a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/index.html b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/index.html new file mode 100644 index 00000000..a074dedc --- /dev/null +++ b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/index.html @@ -0,0 +1,29 @@ + + + +
+ + + +