diff --git a/admin-core/src/main/resources/codeTemplate/java/controller.java b/admin-core/src/main/resources/codeTemplate/java/controller.java index 137d0644..f53fc506 100644 --- a/admin-core/src/main/resources/codeTemplate/java/controller.java +++ b/admin-core/src/main/resources/codeTemplate/java/controller.java @@ -22,15 +22,14 @@ 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.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; 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; @@ -39,6 +38,7 @@ import ${basePackage}.entity.*; import ${basePackage}.service.*; import ${basePackage}.web.query.*; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest; @@ -52,12 +52,14 @@ import java.util.List; import java.util.Map; import java.math.BigDecimal; +import javax.annotation.Resource; + /** * ${entity.displayName} ${entity.comment} 接口 * 切记不要对非线程安全的静态变量进行写操作 */ -\@Controller +\@RestController public class ${entity.name}Controller{ private final Log log = LogFactory.getLog(this.getClass()); @@ -66,15 +68,13 @@ public class ${entity.name}Controller{ @var service=entity.code+"Service"; - \@Autowired private ${entity.name}Service ${service}; + \@Resource private ${entity.name}Service ${service}; - \@Autowired - FileService fileService; + \@Resource FileService fileService; /* 前端接口 */ \@PostMapping(API + "/getPageList.do") - \@ResponseBody public JsonResult getPageList(${entity.name}Query condition,\@SCoreUser CoreUser coreUser){ if(null == coreUser){ return JsonResult.failMessage("请登录后再操作"); @@ -87,7 +87,6 @@ public class ${entity.name}Controller{ \@GetMapping(API + "/getInfo.do") - \@ResponseBody public JsonResult<${entity.name}>getInfo(${entity.name}Query param,\@SCoreUser CoreUser coreUser) { if(null == coreUser){ return JsonResult.failMessage("请登录后再操作"); @@ -99,7 +98,6 @@ public class ${entity.name}Controller{ \@GetMapping(API + "/getList.do") - \@ResponseBody public JsonResult>getList(${entity.name}Query param,\@SCoreUser CoreUser coreUser) { if(null == coreUser){ return JsonResult.failMessage("请登录后再操作"); @@ -114,7 +112,6 @@ public class ${entity.name}Controller{ \@GetMapping(MODEL + "/index.do") \@Function("${entity.code}.query") - \@ResponseBody public ModelAndView index() { ModelAndView view = new ModelAndView("/jlw/${entity.code}/index.html") ; view.addObject("search", ${entity.name}Query.class.getName()); @@ -123,7 +120,6 @@ public class ${entity.name}Controller{ \@GetMapping(MODEL + "/edit.do") \@Function("${entity.code}.edit") - \@ResponseBody public ModelAndView edit(${entity.idAttribute.javaType} ${entity.idAttribute.name}) { ModelAndView view = new ModelAndView("/jlw/${entity.code}/edit.html"); ${entity.name} ${entity.code} = ${service}.queryById(${entity.idAttribute.name}); @@ -133,7 +129,6 @@ public class ${entity.name}Controller{ \@GetMapping(MODEL + "/add.do") \@Function("${entity.code}.add") - \@ResponseBody public ModelAndView add(${entity.idAttribute.javaType} ${entity.idAttribute.name}) { ModelAndView view = new ModelAndView("/jlw/${entity.code}/add.html"); if(null != ${entity.idAttribute.name}){ @@ -149,7 +144,6 @@ public class ${entity.name}Controller{ \@PostMapping(MODEL + "/list.json") \@Function("${entity.code}.query") - \@ResponseBody public JsonResult list(${entity.name}Query condition){ PageQuery page = condition.getPageQuery(); ${service}.queryByCondition(page); @@ -158,20 +152,19 @@ public class ${entity.name}Controller{ \@PostMapping(MODEL + "/addAll.json") \@Function("${entity.code}.add") - \@ResponseBody public JsonResult addAll(${entity.name}Query ${entity.code}Query,\@SCoreUser CoreUser coreUser){ if(null == coreUser){ return JsonResult.failMessage("请登录后再操作"); }else{ @if(entity.existAddTime){ - ${entity.code}Query.set${upperFirst(entity.addTime)}(new Date()); - @} + ${entity.code}Query.set${upperFirst(entity.addTime)}(new Date()); + @} @if(entity.existUserId){ - ${entity.code}Query.setUserId(coreUser.getId()); - @} + ${entity.code}Query.setUserId(coreUser.getId()); + @} @if(entity.existOrgId){ - ${entity.code}Query.setOrgId(coreUser.getOrgId()); - @} + ${entity.code}Query.setOrgId(coreUser.getOrgId()); + @} String msg = ${service}.addAll(${entity.code}Query); if (StringUtils.isBlank(msg)) { return JsonResult.success(); @@ -183,49 +176,47 @@ public class ${entity.name}Controller{ \@PostMapping(MODEL + "/add.json") \@Function("${entity.code}.add") - \@ResponseBody public JsonResult add(\@Validated(ValidateConfig.ADD.class) ${entity.name}Query ${entity.code}Query, BindingResult result,\@SCoreUser CoreUser coreUser){ if(result.hasErrors()){ return JsonResult.failMessage(result); }else{ @if(entity.existAddTime){ - ${entity.code}Query.set${upperFirst(entity.addTime)}(new Date()); - @} + ${entity.code}Query.set${upperFirst(entity.addTime)}(new Date()); + @} @if(entity.existUserId){ - ${entity.code}Query.setUserId(coreUser.getId()); - @} + ${entity.code}Query.setUserId(coreUser.getId()); + @} @if(entity.existOrgId){ - ${entity.code}Query.setOrgId(coreUser.getOrgId()); - @} + ${entity.code}Query.setOrgId(coreUser.getOrgId()); + @} @if(null != entity.status){ @for(attr in attrs) { @if(null != attr.isStatus) { - if(null == ${entity.code}Query.get${upperFirst(attr.name)}()){ - ${entity.code}Query.set${upperFirst(attr.name)}(1); - } + if(null == ${entity.code}Query.get${upperFirst(attr.name)}()){ + ${entity.code}Query.set${upperFirst(attr.name)}(1); + } + @} @} @} - @} return ${service}.add(${entity.code}Query); } } \@PostMapping(MODEL + "/edit.json") \@Function("${entity.code}.edit") - \@ResponseBody public JsonResult update(\@Validated(ValidateConfig.UPDATE.class) ${entity.name}Query ${entity.code}Query, BindingResult result) { if(result.hasErrors()){ return JsonResult.failMessage(result); }else { @if(entity.existAddTime){ - ${entity.code}Query.set${upperFirst(entity.addTime)}(null); - @} + ${entity.code}Query.set${upperFirst(entity.addTime)}(null); + @} @if(entity.existUserId){ - ${entity.code}Query.setUserId(null); - @} + ${entity.code}Query.setUserId(null); + @} @if(entity.existOrgId){ - ${entity.code}Query.setOrgId(null); - @} + ${entity.code}Query.setOrgId(null); + @} String msg = ${service}.edit(${entity.code}Query); if (StringUtils.isBlank(msg)) { return JsonResult.success(); @@ -238,7 +229,6 @@ public class ${entity.name}Controller{ \@GetMapping(MODEL + "/view.json") \@Function("${entity.code}.query") - \@ResponseBody public JsonResult<${entity.name}>queryInfo(${entity.idAttribute.javaType} ${entity.idAttribute.name}) { ${entity.name} ${entity.code} = ${service}.queryById( ${entity.idAttribute.name}); return JsonResult.success(${entity.code}); @@ -246,7 +236,6 @@ public class ${entity.name}Controller{ \@GetMapping(MODEL + "/getValues.json") \@Function("${entity.code}.query") - \@ResponseBody public JsonResult>getValues(${entity.name}Query param) { List<${entity.name}>list = ${service}.getValuesByQuery(param); return JsonResult.success(list); @@ -263,212 +252,208 @@ public class ${entity.name}Controller{ @if(entity.includeExcel){ - //下载模板信息 + //下载模板信息 \@GetMapping(MODEL + "/downloadTemplate.json") - \@ResponseBody - public void download(HttpServletRequest request,HttpServletResponse response,\@SCoreUser CoreUser coreUser) { - if(null == coreUser){ - return; - } - XSSFWorkbook workbook = null; - InputStream is = null; - try { - //TODO 改导入模板名字 - is = new FileInputStream(getFile.p + File.separator +"filesystem"+ File.separator +"template"+ File.separator+ "导入模板.xlsx"); + public void download(HttpServletRequest request,HttpServletResponse response,\@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return; + } + XSSFWorkbook workbook = null; + InputStream is = null; + try { + //TODO 改导入模板名字 + is = new FileInputStream(getFile.p + File.separator +"filesystem"+ File.separator +"template"+ File.separator+ "导入模板.xlsx"); - workbook = new XSSFWorkbook(is); + workbook = new XSSFWorkbook(is); - try { - if(null != is){ - is.close(); + try { + if(null != is){ + is.close(); + } + }catch (Exception e){ + e.printStackTrace(); } - }catch (Exception e){ - e.printStackTrace(); - } - //准备将Excel的输出流通过response输出到页面下载 - //八进制输出流 - response.setContentType("application/octet-stream"); + //准备将Excel的输出流通过response输出到页面下载 + //八进制输出流 + response.setContentType("application/octet-stream"); - //这后面可以设置导出Excel的名称，此例中名为template.xls - String fileName = ToolUtils.web2fileName(request,"${entity.code}Template(" + TimeTool.getNowTime("YMD") + ").xlsx"); + //这后面可以设置导出Excel的名称，此例中名为template.xls + String fileName = ToolUtils.web2fileName(request,"${entity.code}Template(" + TimeTool.getNowTime("YMD") + ").xlsx"); - response.setHeader("Content-disposition", "attachment;filename="+fileName); + response.setHeader("Content-disposition", "attachment;filename="+fileName); - //刷新缓冲 - response.flushBuffer(); + //刷新缓冲 + response.flushBuffer(); - //workbook将Excel写入到response的输出流中，供页面下载 - workbook.write(response.getOutputStream()); - }catch (Exception e){ - e.printStackTrace(); - } finally { - try { - if (null != workbook) { - workbook.close(); - } - if (null != response && null != response.getOutputStream()) { - response.getOutputStream().close(); - } - } catch (Exception e) { } + //workbook将Excel写入到response的输出流中，供页面下载 + workbook.write(response.getOutputStream()); + }catch (Exception e){ + e.printStackTrace(); + } finally { + try { + if (null != workbook) { + workbook.close(); + } + if (null != response && null != response.getOutputStream()) { + response.getOutputStream().close(); + } + } catch (Exception e) { } + } } - } - //导入模板信息 + //导入模板信息 \@PostMapping(MODEL + "/importTemplate.json") \@Function("${entity.code}.importTemplate") - \@ResponseBody - public JsonResult importTemplate(\@RFile List fileEntityList,\@SCoreUser CoreUser coreUser) { - if(null == coreUser){ - return JsonResult.failMessage("请登录后再操作"); - } - Listlist=new ArrayList<>(); - JsonResult jsonResult = ${entity.code}Service.importTemplate(fileEntityList,list,coreUser); - if(list.size()>0){ - ${entity.code}Service.deleteByList(list); + public JsonResult importTemplate(\@RFile List fileEntityList,\@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + } + Listlist=new ArrayList<>(); + JsonResult jsonResult = ${entity.code}Service.importTemplate(fileEntityList,list,coreUser); + if(list.size()>0){ + ${entity.code}Service.deleteByList(list); + } + return jsonResult; } - return jsonResult; - } - //导出信息 + //导出信息 \@GetMapping(MODEL + "/excel/export.json") \@Function("${entity.code}.exportDocument") - \@ResponseBody - public void export(HttpServletRequest request,HttpServletResponse response,${entity.name}Query ${entity.code}Query,\@SCoreUser CoreUser coreUser) { - if(null == coreUser){ - return; - } - HSSFWorkbook workbook = null; - try { - //表头数据 - String[] header = { + public void export(HttpServletRequest request,HttpServletResponse response,${entity.name}Query ${entity.code}Query,\@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return; + } + HSSFWorkbook workbook = null; + try { + //表头数据 + String[] header = { @for(attr in attrs) { @if(!attr.isId && !attr.isOrgId && !attr.isUserId) { @if(attrLP.last){ - "${attr.comment}" + "${attr.comment}" @}else{ - "${attr.comment}", + "${attr.comment}", @} @} @} }; - String[] headerCode = { + String[] headerCode = { @for(attr in attrs) { @if(!attr.isId && !attr.isOrgId && !attr.isUserId) { @if(attrLP.last){ - "${attr.name}" + "${attr.name}" @}else{ - "${attr.name}", + "${attr.name}", @} @} @} }; - //数据内容 - List> mapList = ${entity.code}Service.getExcelValues(${entity.code}Query); + //数据内容 + List> mapList = ${entity.code}Service.getExcelValues(${entity.code}Query); - //内容宽度 - Map widthMap = mapList.get(0); - mapList.remove(0); + //内容宽度 + Map widthMap = mapList.get(0); + mapList.remove(0); - //声明一个工作簿 - workbook = new HSSFWorkbook(); + //声明一个工作簿 + workbook = new HSSFWorkbook(); - //生成一个表格，设置表格名称为"Sheet1" - HSSFSheet sheet = workbook.createSheet("Sheet1"); + //生成一个表格，设置表格名称为"Sheet1" + HSSFSheet sheet = workbook.createSheet("Sheet1"); - //冻结表头 - sheet.createFreezePane(0, 1, 0, 1); + //冻结表头 + sheet.createFreezePane(0, 1, 0, 1); - //设置默认列宽度为5个字节 - sheet.setDefaultColumnWidth(5); + //设置默认列宽度为5个字节 + sheet.setDefaultColumnWidth(5); - //创建第一行表头 - HSSFRow headRow = sheet.createRow(0); + //创建第一行表头 + HSSFRow headRow = sheet.createRow(0); - //头部样式 - HSSFCellStyle headerStyle = workbook.createCellStyle(); - //垂直居中 - headerStyle.setVerticalAlignment(headerStyle.getVerticalAlignmentEnum().CENTER); - //水平居中 - headerStyle.setAlignment(HorizontalAlignment.CENTER); + //头部样式 + HSSFCellStyle headerStyle = workbook.createCellStyle(); + //垂直居中 + headerStyle.setVerticalAlignment(headerStyle.getVerticalAlignmentEnum().CENTER); + //水平居中 + headerStyle.setAlignment(HorizontalAlignment.CENTER); - //单元格样式 - HSSFCellStyle cellStyle = workbook.createCellStyle(); - //垂直居中 - cellStyle.setVerticalAlignment(cellStyle.getVerticalAlignmentEnum().CENTER); - //水平居左 - cellStyle.setAlignment(HorizontalAlignment.CENTER); - //自动换行 - cellStyle.setWrapText(true); + //单元格样式 + HSSFCellStyle cellStyle = workbook.createCellStyle(); + //垂直居中 + cellStyle.setVerticalAlignment(cellStyle.getVerticalAlignmentEnum().CENTER); + //水平居左 + cellStyle.setAlignment(HorizontalAlignment.CENTER); + //自动换行 + cellStyle.setWrapText(true); - //遍历添加表头 - for (int i = 0; i < header.length; i++) { + //遍历添加表头 + for (int i = 0; i < header.length; i++) { - //设置表格特定的列宽度 - if (null != widthMap.get(headerCode[i])) { - String width = widthMap.get(headerCode[i]).toString().split("\\.")[0]; - Integer w = Integer.parseInt(width) > header[i].length()*3?Integer.parseInt(width):header[i].length()*3; - sheet.setColumnWidth(i, w * 190); - } + //设置表格特定的列宽度 + if (null != widthMap.get(headerCode[i])) { + String width = widthMap.get(headerCode[i]).toString().split("\\.")[0]; + Integer w = Integer.parseInt(width) > header[i].length()*3?Integer.parseInt(width):header[i].length()*3; + sheet.setColumnWidth(i, w * 190); + } - //创建一个单元格 - HSSFCell cell = headRow.createCell(i); + //创建一个单元格 + HSSFCell cell = headRow.createCell(i); - //创建一个内容对象 - HSSFRichTextString text = new HSSFRichTextString(header[i]); + //创建一个内容对象 + HSSFRichTextString text = new HSSFRichTextString(header[i]); - //将内容对象的文字内容写入到单元格中 - cell.setCellValue(text); + //将内容对象的文字内容写入到单元格中 + cell.setCellValue(text); - //设置样式 - cell.setCellStyle(headerStyle); - } + //设置样式 + cell.setCellStyle(headerStyle); + } - //遍历结果集，把内容加入表格 - for (int i = 0; i < mapList.size(); i++) { - HSSFRow row = sheet.createRow(i + 1); + //遍历结果集，把内容加入表格 + for (int i = 0; i < mapList.size(); i++) { + HSSFRow row = sheet.createRow(i + 1); - row.setHeight((short) (50*10)); + row.setHeight((short) (50*10)); - Map map = mapList.get(i); - for (int j = 0; j < headerCode.length; j++) { - HSSFCell cell = row.createCell(j); - cell.setCellStyle(cellStyle); - HSSFRichTextString text = new HSSFRichTextString(null != map.get(headerCode[j]) ? map.get(headerCode[j]).toString() : " "); - cell.setCellValue(text); + Map map = mapList.get(i); + for (int j = 0; j < headerCode.length; j++) { + HSSFCell cell = row.createCell(j); + cell.setCellStyle(cellStyle); + HSSFRichTextString text = new HSSFRichTextString(null != map.get(headerCode[j]) ? map.get(headerCode[j]).toString() : " "); + cell.setCellValue(text); + } } - } - //准备将Excel的输出流通过response输出到页面下载 - //八进制输出流 - response.setContentType("application/octet-stream"); + //准备将Excel的输出流通过response输出到页面下载 + //八进制输出流 + response.setContentType("application/octet-stream"); - //这后面可以设置导出Excel的名称，此例中名为student.xls - String fileName = ToolUtils.web2fileName(request,"${entity.code}(" + TimeTool.getNowTime("YMD") + ").xls"); + //这后面可以设置导出Excel的名称，此例中名为student.xls + String fileName = ToolUtils.web2fileName(request,"${entity.code}(" + TimeTool.getNowTime("YMD") + ").xls"); - response.setHeader("Content-disposition", "attachment;filename="+fileName); + response.setHeader("Content-disposition", "attachment;filename="+fileName); - //刷新缓冲 - response.flushBuffer(); + //刷新缓冲 + response.flushBuffer(); - //workbook将Excel写入到response的输出流中，供页面下载 - workbook.write(response.getOutputStream()); - }catch (Exception e){ - e.printStackTrace(); - } finally { - try { - if (null != workbook) { - workbook.close(); - } - if (null != response && null != response.getOutputStream()) { - response.getOutputStream().close(); - } - } catch (Exception e) { } + //workbook将Excel写入到response的输出流中，供页面下载 + workbook.write(response.getOutputStream()); + }catch (Exception e){ + e.printStackTrace(); + } finally { + try { + if (null != workbook) { + workbook.close(); + } + if (null != response && null != response.getOutputStream()) { + response.getOutputStream().close(); + } + } catch (Exception e) { } + } } - } - - @} + @} } diff --git a/admin-core/src/main/resources/codeTemplate/java/dao.java b/admin-core/src/main/resources/codeTemplate/java/dao.java index 12834745..32690e92 100644 --- a/admin-core/src/main/resources/codeTemplate/java/dao.java +++ b/admin-core/src/main/resources/codeTemplate/java/dao.java @@ -10,29 +10,28 @@ 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; -import org.springframework.stereotype.Repository; /** * ${entity.displayName} Dao */ \@SqlResource("${entity.system}.${entity.code}") public interface ${entity.name}Dao extends BaseMapper<${entity.name}>{ - public PageQuery<${entity.name}> queryByCondition(PageQuery query); - public PageQuery<${entity.name}> queryByConditionQuery(PageQuery query); + PageQuery<${entity.name}> queryByCondition(PageQuery query); + PageQuery<${entity.name}> queryByConditionQuery(PageQuery query); @if(null != entity.status){ - @Update - public void delete${entity.name}ByIds(String ids); - @Update - public void deleteByIds(String ids); + \@Update + void delete${entity.name}ByIds(String ids); + \@Update + void deleteByIds(String ids); @}else{ - @Update - public void delete${entity.name}ByIds(String ids); + \@Update + void delete${entity.name}ByIds(String ids); @} - @Update - public int updateGivenByIds(${entity.name}Query ${entity.code}Query); - public List<${entity.name}> getByIds(String ids); - public List<${entity.name}> getValuesByQuery(${entity.name}Query ${entity.code}Query); + \@Update + int updateGivenByIds(${entity.name}Query ${entity.code}Query); + List<${entity.name}> getByIds(String ids); + List<${entity.name}> getValuesByQuery(${entity.name}Query ${entity.code}Query); @if(entity.includeExcel){ - public List>getExcelValues(${entity.name}Query ${entity.code}Query); + List>getExcelValues(${entity.name}Query ${entity.code}Query); @} } diff --git a/admin-core/src/main/resources/codeTemplate/java/pojo.java b/admin-core/src/main/resources/codeTemplate/java/pojo.java index 8abefc8d..a2399875 100644 --- a/admin-core/src/main/resources/codeTemplate/java/pojo.java +++ b/admin-core/src/main/resources/codeTemplate/java/pojo.java @@ -3,7 +3,7 @@ package ${package}; import javax.validation.constraints.NotNull; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.*; +import org.beetl.sql.annotation.entity.*; import com.ibeetl.admin.core.util.ValidateConfig; @@ -24,7 +24,7 @@ public class ${className} extends BaseEntity{ @} @if(attr.isId) { \@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - \// @SeqID(name = ORACLE_CORE_SEQ_NAME) + // \@SeqID(name = ORACLE_CORE_SEQ_NAME) \@AssignID(value = "maskAutoID",param = "${package}.${className}") @} @if(isNotEmpty(attr.dictType)) { diff --git a/admin-core/src/main/resources/codeTemplate/java/service.java b/admin-core/src/main/resources/codeTemplate/java/service.java index d0e857ec..01c32012 100644 --- a/admin-core/src/main/resources/codeTemplate/java/service.java +++ b/admin-core/src/main/resources/codeTemplate/java/service.java @@ -29,10 +29,12 @@ 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 javax.annotation.Resource; /** * ${entity.displayName} Service @@ -43,7 +45,7 @@ import org.springframework.transaction.annotation.Transactional; \@Transactional public class ${entity.name}Service extends CoreBaseService<${entity.name}>{ - \@Autowired private ${entity.name}Dao ${entity.code}Dao; + \@Resource private ${entity.name}Dao ${entity.code}Dao; public PageQuery<${entity.name}>queryByCondition(PageQuery query){ PageQuery ret = ${entity.code}Dao.queryByCondition(query); @@ -142,7 +144,7 @@ public class ${entity.name}Service extends CoreBaseService<${entity.name}>{ } public List<${entity.name}> getValues (Object paras){ - return sqlManager.select(SqlId.of("jlw.${entity.code}.get${entity.name}Values",${entity.name}.class,paras); + return sqlManager.select(SqlId.of("jlw.${entity.code}.get${entity.name}Values"), ${entity.name}.class, paras); } public List<${entity.name}> getValuesByQuery (${entity.name}Query ${entity.code}Query){ diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScoreDashboardDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScoreDashboardDao.java new file mode 100644 index 00000000..ce250e81 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScoreDashboardDao.java @@ -0,0 +1,25 @@ +package com.ibeetl.jlw.dao; + +import com.ibeetl.jlw.entity.TeacherOpenCourseScoreDashboard; +import com.ibeetl.jlw.web.query.TeacherOpenCourseScoreDashboardQuery; +import org.beetl.sql.core.engine.PageQuery; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; +import org.beetl.sql.mapper.annotation.Update; + +import java.util.List; + +/** + * 开课成绩看板 Dao + */ +@SqlResource("jlw.teacherOpenCourseScoreDashboard") +public interface TeacherOpenCourseScoreDashboardDao extends BaseMapper{ + PageQuery queryByCondition(PageQuery query); + PageQuery queryByConditionQuery(PageQuery query); + @Update + void deleteTeacherOpenCourseScoreDashboardByIds(String ids); + @Update + int updateGivenByIds(TeacherOpenCourseScoreDashboardQuery teacherOpenCourseScoreDashboardQuery); + List getByIds(String ids); + List getValuesByQuery(TeacherOpenCourseScoreDashboardQuery teacherOpenCourseScoreDashboardQuery); +} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScoreDashboard.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScoreDashboard.java new file mode 100644 index 00000000..8f000a40 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScoreDashboard.java @@ -0,0 +1,281 @@ +package com.ibeetl.jlw.entity; + +import com.ibeetl.admin.core.annotation.Dict; +import com.ibeetl.admin.core.entity.BaseEntity; +import com.ibeetl.admin.core.util.ValidateConfig; +import org.beetl.sql.annotation.entity.AssignID; + +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.Date; + +/* +* 教师-我的课程-成绩看板 +* gen by Spring Boot2 Admin 2022-09-15 +*/ +public class TeacherOpenCourseScoreDashboard extends BaseEntity{ + + //课程开课-成绩看板ID + @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) + @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseScoreDashboard") + + private Long teacherOpenCourseScoreDashboardId ; + + //学生ID + @Dict(type="student.student_name.student_status=1") + + private Long studentId ; + + //签到成绩 + + private BigDecimal signinScore ; + + //章节练习成绩 + + private BigDecimal courseScore ; + + //课程实操成绩 + + private BigDecimal realOperationScore ; + + //作业成绩 + + private BigDecimal questionHomeworkScore ; + + //考试成绩 + + private BigDecimal examScore ; + + //互动成绩 + + private BigDecimal chatScore ; + + //总成绩 + + private BigDecimal totalScore ; + + //手动调整的分数 + + private BigDecimal manualScore ; + + //最终成绩 + + private BigDecimal lastScore ; + + //成绩状态（保存中文） + + private String lastStatus ; + + //组织ID + + private Long orgId ; + + //用户ID + + private Long userId ; + + //创建时间 + + private Date createTime ; + + public TeacherOpenCourseScoreDashboard(){ + } + + /**课程开课-成绩看板ID + *@return + */ + public Long getTeacherOpenCourseScoreDashboardId(){ + return teacherOpenCourseScoreDashboardId; + } + /**课程开课-成绩看板ID + *@param teacherOpenCourseScoreDashboardId + */ + public void setTeacherOpenCourseScoreDashboardId(Long teacherOpenCourseScoreDashboardId){ + this.teacherOpenCourseScoreDashboardId = teacherOpenCourseScoreDashboardId; + } + + /**学生ID + *@return + */ + public Long getStudentId(){ + return studentId; + } + /**学生ID + *@param studentId + */ + public void setStudentId(Long studentId){ + this.studentId = studentId; + } + + /**签到成绩 + *@return + */ + public BigDecimal getSigninScore(){ + return signinScore; + } + /**签到成绩 + *@param signinScore + */ + public void setSigninScore(BigDecimal signinScore){ + this.signinScore = signinScore; + } + + /**章节练习成绩 + *@return + */ + public BigDecimal getCourseScore(){ + return courseScore; + } + /**章节练习成绩 + *@param courseScore + */ + public void setCourseScore(BigDecimal courseScore){ + this.courseScore = courseScore; + } + + /**课程实操成绩 + *@return + */ + public BigDecimal getRealOperationScore(){ + return realOperationScore; + } + /**课程实操成绩 + *@param realOperationScore + */ + public void setRealOperationScore(BigDecimal realOperationScore){ + this.realOperationScore = realOperationScore; + } + + /**作业成绩 + *@return + */ + public BigDecimal getQuestionHomeworkScore(){ + return questionHomeworkScore; + } + /**作业成绩 + *@param questionHomeworkScore + */ + public void setQuestionHomeworkScore(BigDecimal questionHomeworkScore){ + this.questionHomeworkScore = questionHomeworkScore; + } + + /**考试成绩 + *@return + */ + public BigDecimal getExamScore(){ + return examScore; + } + /**考试成绩 + *@param examScore + */ + public void setExamScore(BigDecimal examScore){ + this.examScore = examScore; + } + + /**互动成绩 + *@return + */ + public BigDecimal getChatScore(){ + return chatScore; + } + /**互动成绩 + *@param chatScore + */ + public void setChatScore(BigDecimal chatScore){ + this.chatScore = chatScore; + } + + /**总成绩 + *@return + */ + public BigDecimal getTotalScore(){ + return totalScore; + } + /**总成绩 + *@param totalScore + */ + public void setTotalScore(BigDecimal totalScore){ + this.totalScore = totalScore; + } + + /**手动调整的分数 + *@return + */ + public BigDecimal getManualScore(){ + return manualScore; + } + /**手动调整的分数 + *@param manualScore + */ + public void setManualScore(BigDecimal manualScore){ + this.manualScore = manualScore; + } + + /**最终成绩 + *@return + */ + public BigDecimal getLastScore(){ + return lastScore; + } + /**最终成绩 + *@param lastScore + */ + public void setLastScore(BigDecimal lastScore){ + this.lastScore = lastScore; + } + + /**成绩状态（保存中文） + *@return + */ + public String getLastStatus(){ + return lastStatus; + } + /**成绩状态（保存中文） + *@param lastStatus + */ + public void setLastStatus(String lastStatus){ + this.lastStatus = lastStatus; + } + + /**组织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 getCreateTime(){ + return createTime; + } + /**创建时间 + *@param createTime + */ + public void setCreateTime(Date createTime){ + this.createTime = createTime; + } + + +} diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java new file mode 100644 index 00000000..47262a1b --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java @@ -0,0 +1,147 @@ +package com.ibeetl.jlw.service; + +import cn.jlw.util.ToolUtils; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.ibeetl.admin.core.service.CoreBaseService; +import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.admin.core.web.JsonResult; +import com.ibeetl.admin.core.web.JsonReturnCode; +import com.ibeetl.jlw.dao.TeacherOpenCourseScoreDashboardDao; +import com.ibeetl.jlw.entity.TeacherOpenCourseScoreDashboard; +import com.ibeetl.jlw.web.query.TeacherOpenCourseScoreDashboardQuery; +import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; +import org.beetl.sql.core.engine.PageQuery; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * 开课成绩看板 Service + * 当分布式ID开启后请勿使用insert(*,true) + */ + +@Service +@Transactional +public class TeacherOpenCourseScoreDashboardService extends CoreBaseService{ + + @Resource private TeacherOpenCourseScoreDashboardDao teacherOpenCourseScoreDashboardDao; + + public PageQueryqueryByCondition(PageQuery query){ + PageQuery ret = teacherOpenCourseScoreDashboardDao.queryByCondition(query); + queryListAfter(ret.getList()); + return ret; + } + + public PageQueryqueryByConditionQuery(PageQuery query){ + PageQuery ret = teacherOpenCourseScoreDashboardDao.queryByConditionQuery(query); + queryListAfter(ret.getList()); + return ret; + } + + public void deleteByList(List list){ + String ids = ""; + ToolUtils.deleteNullList(list); + for(int i=0;null != list && i teacherOpenCourseScoreDashboardList = new ArrayList<>(); + try { + teacherOpenCourseScoreDashboardList = JSON.parseArray(teacherOpenCourseScoreDashboardQuery.getTeacherOpenCourseScoreDashboardJsonStr(), TeacherOpenCourseScoreDashboard.class); + } catch (Exception e) { + try { + teacherOpenCourseScoreDashboardList.add(JSONObject.parseObject(teacherOpenCourseScoreDashboardQuery.getTeacherOpenCourseScoreDashboardJsonStr(), TeacherOpenCourseScoreDashboard.class)); + } catch (Exception e1) {} + } + ToolUtils.deleteNullList(teacherOpenCourseScoreDashboardList); + if(null != teacherOpenCourseScoreDashboardList && teacherOpenCourseScoreDashboardList.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.teacherOpenCourseScoreDashboard.getTeacherOpenCourseScoreDashboardValues"), TeacherOpenCourseScoreDashboard.class, paras); + } + + public List getValuesByQuery (TeacherOpenCourseScoreDashboardQuery teacherOpenCourseScoreDashboardQuery){ + return teacherOpenCourseScoreDashboardDao.getValuesByQuery(teacherOpenCourseScoreDashboardQuery); + } + + public TeacherOpenCourseScoreDashboard getInfo (Long teacherOpenCourseScoreDashboardId){ + TeacherOpenCourseScoreDashboardQuery teacherOpenCourseScoreDashboardQuery = new TeacherOpenCourseScoreDashboardQuery(); + teacherOpenCourseScoreDashboardQuery.setTeacherOpenCourseScoreDashboardId(teacherOpenCourseScoreDashboardId); + List list = teacherOpenCourseScoreDashboardDao.getValuesByQuery(teacherOpenCourseScoreDashboardQuery); + if(null != list && list.size()>0){ + return list.get(0); + }else{ + return null; + } + } + + public TeacherOpenCourseScoreDashboard getInfo (TeacherOpenCourseScoreDashboardQuery teacherOpenCourseScoreDashboardQuery){ + List list = teacherOpenCourseScoreDashboardDao.getValuesByQuery(teacherOpenCourseScoreDashboardQuery); + if(null != list && list.size()>0){ + return list.get(0); + }else{ + return null; + } + } + +} diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScoreDashboardController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScoreDashboardController.java new file mode 100644 index 00000000..71b6d61a --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScoreDashboardController.java @@ -0,0 +1,193 @@ +package com.ibeetl.jlw.web; + +import cn.jlw.Interceptor.SCoreUser; +import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.annotation.Function; +import com.ibeetl.admin.core.entity.CoreUser; +import com.ibeetl.admin.core.file.FileService; +import com.ibeetl.admin.core.web.JsonResult; +import com.ibeetl.jlw.entity.TeacherOpenCourseScoreDashboard; +import com.ibeetl.jlw.service.TeacherOpenCourseScoreDashboardService; +import com.ibeetl.jlw.web.query.TeacherOpenCourseScoreDashboardQuery; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.beetl.sql.core.engine.PageQuery; +import org.springframework.validation.BindingResult; +import org.springframework.validation.annotation.Validated; +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.web.servlet.ModelAndView; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 开课成绩看板 教师-我的课程-成绩看板 接口 + * 切记不要对非线程安全的静态变量进行写操作 + */ + +@RestController +public class TeacherOpenCourseScoreDashboardController{ + + private final Log log = LogFactory.getLog(this.getClass()); + private static final String MODEL = "/jlw/teacherOpenCourseScoreDashboard"; + private static final String API = "/api/teacherOpenCourseScoreDashboard"; + + + @Resource private TeacherOpenCourseScoreDashboardService teacherOpenCourseScoreDashboardService; + + @Resource FileService fileService; + + /* 前端接口 */ + + @PostMapping(API + "/getPageList.do") + public JsonResult getPageList(TeacherOpenCourseScoreDashboardQuery condition,@SCoreUser CoreUser coreUser){ + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + PageQuery page = condition.getPageQuery(); + teacherOpenCourseScoreDashboardService.queryByConditionQuery(page); + return JsonResult.success(page); + } + } + + + @GetMapping(API + "/getInfo.do") + public JsonResultgetInfo(TeacherOpenCourseScoreDashboardQuery param,@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + TeacherOpenCourseScoreDashboard teacherOpenCourseScoreDashboard = teacherOpenCourseScoreDashboardService.getInfo(param); + return JsonResult.success(teacherOpenCourseScoreDashboard); + } + } + + + @GetMapping(API + "/getList.do") + public JsonResult>getList(TeacherOpenCourseScoreDashboardQuery param,@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + Listlist = teacherOpenCourseScoreDashboardService.getValuesByQuery(param); + return JsonResult.success(list); + } + } + + + /* 后台页面 */ + + @GetMapping(MODEL + "/index.do") + @Function("teacherOpenCourseScoreDashboard.query") + public ModelAndView index() { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseScoreDashboard/index.html") ; + view.addObject("search", TeacherOpenCourseScoreDashboardQuery.class.getName()); + return view; + } + + @GetMapping(MODEL + "/edit.do") + @Function("teacherOpenCourseScoreDashboard.edit") + public ModelAndView edit(Long teacherOpenCourseScoreDashboardId) { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseScoreDashboard/edit.html"); + TeacherOpenCourseScoreDashboard teacherOpenCourseScoreDashboard = teacherOpenCourseScoreDashboardService.queryById(teacherOpenCourseScoreDashboardId); + view.addObject("teacherOpenCourseScoreDashboard", teacherOpenCourseScoreDashboard); + return view; + } + + @GetMapping(MODEL + "/add.do") + @Function("teacherOpenCourseScoreDashboard.add") + public ModelAndView add(Long teacherOpenCourseScoreDashboardId) { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseScoreDashboard/add.html"); + if(null != teacherOpenCourseScoreDashboardId){ + TeacherOpenCourseScoreDashboard teacherOpenCourseScoreDashboard = teacherOpenCourseScoreDashboardService.queryById(teacherOpenCourseScoreDashboardId); + view.addObject("teacherOpenCourseScoreDashboard", teacherOpenCourseScoreDashboard); + }else { + view.addObject("teacherOpenCourseScoreDashboard", new TeacherOpenCourseScoreDashboard()); + } + return view; + } + + /* 后台接口 */ + + @PostMapping(MODEL + "/list.json") + @Function("teacherOpenCourseScoreDashboard.query") + public JsonResult list(TeacherOpenCourseScoreDashboardQuery condition){ + PageQuery page = condition.getPageQuery(); + teacherOpenCourseScoreDashboardService.queryByCondition(page); + return JsonResult.success(page); + } + + @PostMapping(MODEL + "/addAll.json") + @Function("teacherOpenCourseScoreDashboard.add") + public JsonResult addAll(TeacherOpenCourseScoreDashboardQuery teacherOpenCourseScoreDashboardQuery,@SCoreUser CoreUser coreUser){ + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + teacherOpenCourseScoreDashboardQuery.setUserId(coreUser.getId()); + teacherOpenCourseScoreDashboardQuery.setOrgId(coreUser.getOrgId()); + String msg = teacherOpenCourseScoreDashboardService.addAll(teacherOpenCourseScoreDashboardQuery); + if (StringUtils.isBlank(msg)) { + return JsonResult.success(); + } else { + return JsonResult.failMessage("新增失败,"+msg); + } + } + } + + @PostMapping(MODEL + "/add.json") + @Function("teacherOpenCourseScoreDashboard.add") + public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseScoreDashboardQuery teacherOpenCourseScoreDashboardQuery, BindingResult result,@SCoreUser CoreUser coreUser){ + if(result.hasErrors()){ + return JsonResult.failMessage(result); + }else{ + teacherOpenCourseScoreDashboardQuery.setUserId(coreUser.getId()); + teacherOpenCourseScoreDashboardQuery.setOrgId(coreUser.getOrgId()); + return teacherOpenCourseScoreDashboardService.add(teacherOpenCourseScoreDashboardQuery); + } + } + + @PostMapping(MODEL + "/edit.json") + @Function("teacherOpenCourseScoreDashboard.edit") + public JsonResult update(@Validated(ValidateConfig.UPDATE.class) TeacherOpenCourseScoreDashboardQuery teacherOpenCourseScoreDashboardQuery, BindingResult result) { + if(result.hasErrors()){ + return JsonResult.failMessage(result); + }else { + teacherOpenCourseScoreDashboardQuery.setUserId(null); + teacherOpenCourseScoreDashboardQuery.setOrgId(null); + String msg = teacherOpenCourseScoreDashboardService.edit(teacherOpenCourseScoreDashboardQuery); + if (StringUtils.isBlank(msg)) { + return JsonResult.success(); + } else { + return JsonResult.failMessage("更新失败,"+msg); + } + } + } + + + @GetMapping(MODEL + "/view.json") + @Function("teacherOpenCourseScoreDashboard.query") + public JsonResultqueryInfo(Long teacherOpenCourseScoreDashboardId) { + TeacherOpenCourseScoreDashboard teacherOpenCourseScoreDashboard = teacherOpenCourseScoreDashboardService.queryById( teacherOpenCourseScoreDashboardId); + return JsonResult.success(teacherOpenCourseScoreDashboard); + } + + @GetMapping(MODEL + "/getValues.json") + @Function("teacherOpenCourseScoreDashboard.query") + public JsonResult>getValues(TeacherOpenCourseScoreDashboardQuery param) { + Listlist = teacherOpenCourseScoreDashboardService.getValuesByQuery(param); + return JsonResult.success(list); + } + + + @PostMapping(MODEL + "/delete.json") + @Function("teacherOpenCourseScoreDashboard.delete") + @ResponseBody + public JsonResult delete(String ids) { + teacherOpenCourseScoreDashboardService.deleteTeacherOpenCourseScoreDashboard(ids); + return JsonResult.success(); + } + + +} diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScoreDashboardQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScoreDashboardQuery.java new file mode 100644 index 00000000..24d5bb4b --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScoreDashboardQuery.java @@ -0,0 +1,204 @@ +package com.ibeetl.jlw.web.query; + +import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.annotation.Query; +import com.ibeetl.admin.core.web.query.PageParam; +import com.ibeetl.jlw.entity.TeacherOpenCourseScoreDashboard; + +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.Date; + +/** + *开课成绩看板查询 + */ +public class TeacherOpenCourseScoreDashboardQuery extends PageParam { + @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) + @Query(name = "课程开课-成绩看板ID", display = false) + private Long teacherOpenCourseScoreDashboardId; + @Query(name = "学生ID", display = true,type=Query.TYPE_DICT,dict="student.student_name.student_status=1") + private Long studentId; + @Query(name = "签到成绩", display = false) + private BigDecimal signinScore; + @Query(name = "章节练习成绩", display = false) + private BigDecimal courseScore; + @Query(name = "课程实操成绩", display = false) + private BigDecimal realOperationScore; + @Query(name = "作业成绩", display = false) + private BigDecimal questionHomeworkScore; + @Query(name = "考试成绩", display = false) + private BigDecimal examScore; + @Query(name = "互动成绩", display = false) + private BigDecimal chatScore; + @Query(name = "总成绩", display = false) + private BigDecimal totalScore; + @Query(name = "手动调整的分数", display = false) + private BigDecimal manualScore; + @Query(name = "最终成绩", display = false) + private BigDecimal lastScore; + @Query(name = "成绩状态（保存中文）", display = false) + private String lastStatus; + @Query(name = "组织ID", display = false) + private Long orgId; + @Query(name = "用户ID", display = false) + private Long userId; + @Query(name = "创建时间", display = false) + private Date createTime; + + private String teacherOpenCourseScoreDashboardIdPlural; + private String studentIdPlural; + private String orgIdPlural; + private String userIdPlural; + + private String teacherOpenCourseScoreDashboardJsonStr;//json格式 + + private String _given;//指定更新的特定字段，多个逗号隔开 + + public Long getTeacherOpenCourseScoreDashboardId(){ + return teacherOpenCourseScoreDashboardId; + } + public void setTeacherOpenCourseScoreDashboardId(Long teacherOpenCourseScoreDashboardId ){ + this.teacherOpenCourseScoreDashboardId = teacherOpenCourseScoreDashboardId; + } + public Long getStudentId(){ + return studentId; + } + public void setStudentId(Long studentId ){ + this.studentId = studentId; + } + public BigDecimal getSigninScore(){ + return signinScore; + } + public void setSigninScore(BigDecimal signinScore ){ + this.signinScore = signinScore; + } + public BigDecimal getCourseScore(){ + return courseScore; + } + public void setCourseScore(BigDecimal courseScore ){ + this.courseScore = courseScore; + } + public BigDecimal getRealOperationScore(){ + return realOperationScore; + } + public void setRealOperationScore(BigDecimal realOperationScore ){ + this.realOperationScore = realOperationScore; + } + public BigDecimal getQuestionHomeworkScore(){ + return questionHomeworkScore; + } + public void setQuestionHomeworkScore(BigDecimal questionHomeworkScore ){ + this.questionHomeworkScore = questionHomeworkScore; + } + public BigDecimal getExamScore(){ + return examScore; + } + public void setExamScore(BigDecimal examScore ){ + this.examScore = examScore; + } + public BigDecimal getChatScore(){ + return chatScore; + } + public void setChatScore(BigDecimal chatScore ){ + this.chatScore = chatScore; + } + public BigDecimal getTotalScore(){ + return totalScore; + } + public void setTotalScore(BigDecimal totalScore ){ + this.totalScore = totalScore; + } + public BigDecimal getManualScore(){ + return manualScore; + } + public void setManualScore(BigDecimal manualScore ){ + this.manualScore = manualScore; + } + public BigDecimal getLastScore(){ + return lastScore; + } + public void setLastScore(BigDecimal lastScore ){ + this.lastScore = lastScore; + } + public String getLastStatus(){ + return lastStatus; + } + public void setLastStatus(String lastStatus ){ + this.lastStatus = lastStatus; + } + 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 getCreateTime(){ + return createTime; + } + public void setCreateTime(Date createTime ){ + this.createTime = createTime; + } + + public TeacherOpenCourseScoreDashboard pojo(){ + TeacherOpenCourseScoreDashboard pojo = new TeacherOpenCourseScoreDashboard(); + pojo.setTeacherOpenCourseScoreDashboardId(this.getTeacherOpenCourseScoreDashboardId()); + pojo.setStudentId(this.getStudentId()); + pojo.setSigninScore(this.getSigninScore()); + pojo.setCourseScore(this.getCourseScore()); + pojo.setRealOperationScore(this.getRealOperationScore()); + pojo.setQuestionHomeworkScore(this.getQuestionHomeworkScore()); + pojo.setExamScore(this.getExamScore()); + pojo.setChatScore(this.getChatScore()); + pojo.setTotalScore(this.getTotalScore()); + pojo.setManualScore(this.getManualScore()); + pojo.setLastScore(this.getLastScore()); + pojo.setLastStatus(this.getLastStatus()); + pojo.setOrgId(this.getOrgId()); + pojo.setUserId(this.getUserId()); + pojo.setCreateTime(this.getCreateTime()); + return pojo; + } + + public String getTeacherOpenCourseScoreDashboardIdPlural(){ + return teacherOpenCourseScoreDashboardIdPlural; + } + public void setTeacherOpenCourseScoreDashboardIdPlural(String teacherOpenCourseScoreDashboardIdPlural){ + this.teacherOpenCourseScoreDashboardIdPlural = teacherOpenCourseScoreDashboardIdPlural; + } + public String getStudentIdPlural(){ + return studentIdPlural; + } + public void setStudentIdPlural(String studentIdPlural){ + this.studentIdPlural = studentIdPlural; + } + 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 getTeacherOpenCourseScoreDashboardJsonStr(){ + return teacherOpenCourseScoreDashboardJsonStr; + } + public void setTeacherOpenCourseScoreDashboardJsonStr(String teacherOpenCourseScoreDashboardJsonStr ){ + this.teacherOpenCourseScoreDashboardJsonStr = teacherOpenCourseScoreDashboardJsonStr; + } + public String get_given() { + return _given; + } + public void set_given(String _given) { + this._given = _given; + } +} diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseScoreDashboard.md b/web/src/main/resources/sql/jlw/teacherOpenCourseScoreDashboard.md new file mode 100644 index 00000000..e69de29b diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/add.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/add.js new file mode 100644 index 00000000..00a05a18 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/add.js @@ -0,0 +1,38 @@ +layui.define([ 'form', 'laydate', 'table','teacherOpenCourseScoreDashboardApi'], function(exports) { + var form = layui.form; + var teacherOpenCourseScoreDashboardApi = layui.teacherOpenCourseScoreDashboardApi; + 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 teacherOpenCourseScoreDashboardId = $("#addForm input[name='teacherOpenCourseScoreDashboardId']").val(); + if(!$.isEmpty(teacherOpenCourseScoreDashboardId)){ + teacherOpenCourseScoreDashboardApi.updateTeacherOpenCourseScoreDashboard($('#addForm'),function(){ + parent.window.dataReload(); + Common.info("更新成功"); + Lib.closeFrame(); + }); + }else{ + teacherOpenCourseScoreDashboardApi.addTeacherOpenCourseScoreDashboard($('#addForm'),function(){ + parent.window.dataReload(); + Common.info("添加成功"); + Lib.closeFrame(); + }); + } + + }); + }); + + $("#addButton-cancel").click(function(){ + Lib.closeFrame(); + }); + } + + } + exports('add',view); +}); diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/del.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/del.js new file mode 100644 index 00000000..4f13a55d --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/del.js @@ -0,0 +1,23 @@ +layui.define(['table', 'teacherOpenCourseScoreDashboardApi'], function(exports) { + var teacherOpenCourseScoreDashboardApi = layui.teacherOpenCourseScoreDashboardApi; + var table=layui.table; + var view = { + init:function(){ + }, + delBatch:function(){ + var data = Common.getMoreDataFromTable(table,"teacherOpenCourseScoreDashboardTable"); + if(data==null){ + return ; + } + Common.openConfirm("确认要删除这些开课成绩看板?",function(){ + var ids =Common.concatBatchId(data,"teacherOpenCourseScoreDashboardId"); + teacherOpenCourseScoreDashboardApi.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/teacherOpenCourseScoreDashboard/edit.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/edit.js new file mode 100644 index 00000000..8fcf61fc --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/edit.js @@ -0,0 +1,28 @@ +layui.define([ 'form', 'laydate', 'table','teacherOpenCourseScoreDashboardApi'], function(exports) { + var form = layui.form; + var teacherOpenCourseScoreDashboardApi = layui.teacherOpenCourseScoreDashboardApi; + var index = layui.index; + var view = { + init:function(){ + Lib.initGenrealForm($("#updateForm"),form); + this.initSubmit(); + }, + initSubmit:function(){ + $("#updateButton").click(function(){ + form.on('submit(form)', function(){ + teacherOpenCourseScoreDashboardApi.updateTeacherOpenCourseScoreDashboard($('#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/teacherOpenCourseScoreDashboard/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/index.js new file mode 100644 index 00000000..6b192154 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/index.js @@ -0,0 +1,227 @@ +layui.define([ 'form', 'laydate', 'table' ], function(exports) { + var form = layui.form; + var laydate = layui.laydate; + var table = layui.table; + var teacherOpenCourseScoreDashboardTable = null; + var view ={ + init:function(){ + var that = this + this.initTable(); + this.initSearchForm(); + this.initToolBar(); + window.dataReload = function(){ + Lib.doSearchForm($("#searchForm"),teacherOpenCourseScoreDashboardTable) + that.initToolBar(); + } + }, + initTable:function(){ + var sx_ = localStorage.getItem("teacherOpenCourseScoreDashboardTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存 + if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);} + teacherOpenCourseScoreDashboardTable = table.render({ + elem : '#teacherOpenCourseScoreDashboardTable', + height : Lib.getTableHeight(1), + cellMinWidth: 100, + method : 'post', + url : Common.ctxPath + '/jlw/teacherOpenCourseScoreDashboard/list.json' // 数据接口 + ,page : Lib.tablePage // 开启分页 + ,toolbar: '#toolbar_teacherOpenCourseScoreDashboard' //自定义头部左侧工具栏 + ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏 + ,limit : 10, + cols : [ [ // 表头 + { + type : 'checkbox', + + }, + { + field : 'teacherOpenCourseScoreDashboardId', + title : '课程开课-成绩看板ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseScoreDashboardId'])?false:sx_['teacherOpenCourseScoreDashboardId'], + + width : 60, + }, + { + field : 'studentIdText', //数据字典类型为 student.student_name.student_status=1 + title : '学生ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['studentIdText'])?false:sx_['studentIdText'], + }, + { + field : 'signinScore', + title : '签到成绩', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['signinScore'])?false:sx_['signinScore'], + }, + { + field : 'courseScore', + title : '章节练习成绩', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['courseScore'])?false:sx_['courseScore'], + }, + { + field : 'realOperationScore', + title : '课程实操成绩', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['realOperationScore'])?false:sx_['realOperationScore'], + }, + { + field : 'questionHomeworkScore', + title : '作业成绩', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['questionHomeworkScore'])?false:sx_['questionHomeworkScore'], + }, + { + field : 'examScore', + title : '考试成绩', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['examScore'])?false:sx_['examScore'], + }, + { + field : 'chatScore', + title : '互动成绩', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['chatScore'])?false:sx_['chatScore'], + }, + { + field : 'totalScore', + title : '总成绩', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['totalScore'])?false:sx_['totalScore'], + }, + { + field : 'manualScore', + title : '手动调整的分数', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['manualScore'])?false:sx_['manualScore'], + }, + { + field : 'lastScore', + title : '最终成绩', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['lastScore'])?false:sx_['lastScore'], + }, + { + field : 'lastStatus', + title : '成绩状态（保存中文）', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['lastStatus'])?false:sx_['lastStatus'], + }, + { + 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 : 'createTime', + title : '创建时间', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['createTime'])?false:sx_['createTime'], + } + ,{ + field : 'operation_',title : '操作',align:"center", templet: function (d) { + var htm = ''; + htm += ''; + return htm; + } + } + + ] ] + + }); + + table.on('checkbox(teacherOpenCourseScoreDashboardTable)', function(obj){ + var teacherOpenCourseScoreDashboard = obj.data; + if(obj.checked){ + //按钮逻辑Lib.buttonEnable() + }else{ + + } + }) + }, + + initSearchForm:function(){ + Lib.initSearchForm( $("#searchForm"),teacherOpenCourseScoreDashboardTable,form); + }, + + initToolBar:function(){ + toolbar = { + add: function () { + var url = "/jlw/teacherOpenCourseScoreDashboard/add.do"; + Common.openDlg(url,"开课成绩看板管理>新增"); + }, + edit: function () { + var data = Common.getOneFromTable(table,"teacherOpenCourseScoreDashboardTable"); + if(data==null){ + return ; + } + var url = "/jlw/teacherOpenCourseScoreDashboard/add.do?teacherOpenCourseScoreDashboardId="+data.teacherOpenCourseScoreDashboardId; + Common.openDlg(url,"开课成绩看板管理>"+data.teacherOpenCourseScoreDashboardId+">编辑"); + }, + del: function () { + layui.use(['del'], function(){ + var delView = layui.del + delView.delBatch(); + }); + }, + search: function () { + Lib.doSearchForm($("#searchForm"), teacherOpenCourseScoreDashboardTable, 1); + view.initToolBar() + }, + refresh: function () { + searchForm.reset(); + Lib.doSearchForm($("#searchForm"), teacherOpenCourseScoreDashboardTable, 1); + view.initToolBar() + }, + } + //触发事件 + $('.ext-toolbar').on('click', function() { + var type = $(this).data('type'); + toolbar[type] ? toolbar[type].call(this) : ''; + }); + + }, initTableTool: table.on('tool(teacherOpenCourseScoreDashboardTable)', function (obj) { + var data = obj.data; + if (obj.event === 'edit') { + var url = "/jlw/teacherOpenCourseScoreDashboard/add.do?teacherOpenCourseScoreDashboardId="+data.teacherOpenCourseScoreDashboardId; + Common.openDlg(url,"开课成绩看板管理>"+data.teacherOpenCourseScoreDashboardId+">编辑"); + }else if(obj.event === "del"){ + layer.confirm('是否确定删除该信息？', function (index) { + var ret = Common.postAjax("/jlw/teacherOpenCourseScoreDashboard/delete.json",{ids:data.teacherOpenCourseScoreDashboardId}); + 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/static/js/jlw/teacherOpenCourseScoreDashboard/teacherOpenCourseScoreDashboardApi.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/teacherOpenCourseScoreDashboardApi.js new file mode 100644 index 00000000..11e23290 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/teacherOpenCourseScoreDashboardApi.js @@ -0,0 +1,18 @@ +/*访问后台的代码*/ +layui.define([], function(exports) { + var api={ + updateTeacherOpenCourseScoreDashboard:function(form,callback){ + Lib.submitForm("/jlw/teacherOpenCourseScoreDashboard/edit.json",form,{},callback) + }, + addTeacherOpenCourseScoreDashboard:function(form,callback){ + Lib.submitForm("/jlw/teacherOpenCourseScoreDashboard/add.json",form,{},callback) + }, + del:function(ids,callback){ + Common.post("/jlw/teacherOpenCourseScoreDashboard/delete.json",{"ids":ids},function(){ + callback(); + }) + } + + }; + exports('teacherOpenCourseScoreDashboardApi',api); +}); \ No newline at end of file diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/add.html new file mode 100644 index 00000000..ffe247fc --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/add.html @@ -0,0 +1,127 @@ + + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/edit.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/edit.html new file mode 100644 index 00000000..c5e41771 --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/edit.html @@ -0,0 +1,127 @@ + + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/index.html new file mode 100644 index 00000000..53ded38d --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/index.html @@ -0,0 +1,29 @@ + + + +
+ + + +