From 2054032ccb565c7dda9efb07ced4767d40a84bd9 Mon Sep 17 00:00:00 2001 From: tamguo Date: Fri, 3 Aug 2018 17:50:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E7=9B=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/tiku/model/CourseEntity.java | 19 +++ .../tiku/model/condition/CourseCondition.java | 29 ++++ .../tiku/model/enums/CourseStatusEnum.java | 34 +++++ .../modules/tiku/service/ICourseService.java | 13 +- .../tiku/service/impl/CourseServiceImpl.java | 36 ++++- .../modules/sys/web/SysUserController.java | 4 +- .../modules/tiku/web/CourseController.java | 57 +++++++- .../templates/modules/tiku/course/add.html | 125 ++++++++++++++++++ .../templates/modules/tiku/course/list.html | 20 ++- .../templates/modules/tiku/course/update.html | 125 ++++++++++++++++++ .../templates/modules/tiku/subject/add.html | 2 +- 11 files changed, 446 insertions(+), 18 deletions(-) create mode 100644 tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/enums/CourseStatusEnum.java create mode 100644 tamguo-oms/src/main/resources/templates/modules/tiku/course/add.html create mode 100644 tamguo-oms/src/main/resources/templates/modules/tiku/course/update.html diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java index eeb4649..cc56b6b 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java @@ -2,10 +2,13 @@ package com.tamguo.modules.tiku.model; import java.util.Date; +import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.FieldFill; +import com.tamguo.modules.tiku.model.enums.CourseStatusEnum; @TableName(value="tiku_course") public class CourseEntity { @@ -17,6 +20,7 @@ public class CourseEntity { private Integer sort; private Integer questionNum; private Integer pointNum; + private String remarks; @TableField(fill = FieldFill.INSERT) private String createBy; @@ -27,6 +31,9 @@ public class CourseEntity { @TableField(fill = FieldFill.INSERT) private Date updateDate; + @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) + private CourseStatusEnum status; + public String getUid() { return uid; } @@ -87,5 +94,17 @@ public class CourseEntity { public void setUpdateDate(Date updateDate) { this.updateDate = updateDate; } + public CourseStatusEnum getStatus() { + return status; + } + public void setStatus(CourseStatusEnum status) { + this.status = status; + } + public String getRemarks() { + return remarks; + } + public void setRemarks(String remarks) { + this.remarks = remarks; + } } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/condition/CourseCondition.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/condition/CourseCondition.java index c83c5bc..074706b 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/condition/CourseCondition.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/condition/CourseCondition.java @@ -5,6 +5,11 @@ public class CourseCondition { private Integer pageNo; private Integer pageSize; + private String uid; + private String name; + private String status; + private String subjectId; + public Integer getPageNo() { return pageNo; } @@ -17,5 +22,29 @@ public class CourseCondition { public void setPageSize(Integer pageSize) { this.pageSize = pageSize; } + public String getUid() { + return uid; + } + public void setUid(String uid) { + this.uid = uid; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getStatus() { + return status; + } + public void setStatus(String status) { + this.status = status; + } + public String getSubjectId() { + return subjectId; + } + public void setSubjectId(String subjectId) { + this.subjectId = subjectId; + } } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/enums/CourseStatusEnum.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/enums/CourseStatusEnum.java new file mode 100644 index 0000000..a99c6fa --- /dev/null +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/enums/CourseStatusEnum.java @@ -0,0 +1,34 @@ +package com.tamguo.modules.tiku.model.enums; + +import java.io.Serializable; +import com.baomidou.mybatisplus.enums.IEnum; + +/** + * 类型状态 + */ +public enum CourseStatusEnum implements IEnum { + NORMAL("normal", "正常"), + DELETE("delete", "删除"), + DISABLED("disabled" , "停用"); + + private String value; + private String desc; + + CourseStatusEnum(final String value, final String desc) { + this.value = value; + this.desc = desc; + } + + public Serializable getValue() { + return this.value; + } + + public String getDesc(){ + return this.desc; + } + + @Override + public String toString() { + return this.value; + } +} diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java index 2404f73..c99209f 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java @@ -1,11 +1,18 @@ package com.tamguo.modules.tiku.service; import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.service.IService; import com.tamguo.modules.tiku.model.CourseEntity; -import com.tamguo.modules.tiku.model.condition.SubjectCondition; +import com.tamguo.modules.tiku.model.condition.CourseCondition; -public interface ICourseService { +public interface ICourseService extends IService{ - Page listData(SubjectCondition condition); + Page listData(CourseCondition condition); + + /** 保存科目*/ + void save(CourseEntity course); + + /** 修改科目*/ + void update(CourseEntity course); } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java index 48ab838..5ba8cc5 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java @@ -1,15 +1,19 @@ package com.tamguo.modules.tiku.service.impl; +import java.util.Arrays; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.tamguo.modules.tiku.dao.CourseMapper; import com.tamguo.modules.tiku.model.CourseEntity; -import com.tamguo.modules.tiku.model.condition.SubjectCondition; +import com.tamguo.modules.tiku.model.condition.CourseCondition; +import com.tamguo.modules.tiku.model.enums.CourseStatusEnum; import com.tamguo.modules.tiku.service.ICourseService; @Service @@ -21,10 +25,36 @@ public class CourseServiceImpl extends ServiceImpl i @SuppressWarnings("unchecked") @Transactional(readOnly=true) @Override - public Page listData(SubjectCondition condition) { - Page page = new Page<>(); + public Page listData(CourseCondition condition) { + Page page = new Page<>(condition.getPageNo() , condition.getPageSize()); Condition query = Condition.create(); + if(!StringUtils.isEmpty(condition.getUid())) { + query.eq("uid", condition.getUid()); + } + if(!StringUtils.isEmpty(condition.getName())) { + query.like("name", condition.getName()); + } + if(!StringUtils.isEmpty(condition.getSubjectId())) { + query.eq("subject_id", condition.getSubjectId()); + } + if(!StringUtils.isEmpty(condition.getStatus())) { + query.eq("status", condition.getStatus()); + } + query.orderAsc(Arrays.asList("sort")); return page.setRecords(courseMapper.selectPage(page , query)); } + @Transactional(readOnly=false) + @Override + public void save(CourseEntity course) { + course.setStatus(CourseStatusEnum.NORMAL); + courseMapper.insert(course); + } + + @Transactional(readOnly=false) + @Override + public void update(CourseEntity course) { + courseMapper.updateById(course); + } + } diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java index 24e86bc..21b619c 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java @@ -41,7 +41,7 @@ public class SysUserController { @RequestMapping(path="list") public ModelAndView list(ModelAndView model) { model.setViewName(USER_LIST_PAGE); - model.addObject("postList", iSysPostService.selectList(Condition.create().eq("status", "0"))); + model.addObject("postList", iSysPostService.selectList(Condition.create().eq("status", "normal"))); return model; } @@ -49,7 +49,7 @@ public class SysUserController { @RequestMapping(path="add") public ModelAndView add(String userCode , ModelAndView model) { model.setViewName(USER_ADD_PAGE); - model.addObject("postList", iSysPostService.selectList(Condition.create().eq("status", "0"))); + model.addObject("postList", iSysPostService.selectList(Condition.create().eq("status", "normal"))); return model; } diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java index 5c1ba58..d3f105c 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java @@ -1,7 +1,6 @@ package com.tamguo.modules.tiku.web; import java.util.Map; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -9,31 +8,81 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; +import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.plugins.Page; +import com.tamguo.common.utils.ExceptionSupport; import com.tamguo.common.utils.Result; import com.tamguo.modules.tiku.model.CourseEntity; -import com.tamguo.modules.tiku.model.condition.SubjectCondition; +import com.tamguo.modules.tiku.model.condition.CourseCondition; +import com.tamguo.modules.tiku.model.enums.SubjectStatusEnum; import com.tamguo.modules.tiku.service.ICourseService; +import com.tamguo.modules.tiku.service.ISubjectService; @Controller @RequestMapping(path="tiku/course") public class CourseController { - /** 题库科目*/ + /** 科目*/ private final String COURSE_INDEX_PAGE = "modules/tiku/course/list"; + private final String COURSE_ADD_PAGE = "modules/tiku/course/add"; + private final String COURSE_UPDATE_PAGE = "modules/tiku/course/update"; + @Autowired private ICourseService iCourseService; + @Autowired + private ISubjectService iSubjectService; + @SuppressWarnings("unchecked") @RequestMapping(path="list") public ModelAndView index(ModelAndView model) { model.setViewName(COURSE_INDEX_PAGE); + model.addObject("subjectList", iSubjectService.selectList(Condition.create().eq("status", SubjectStatusEnum.NORMAL.getValue()))); + return model; + } + + @SuppressWarnings("unchecked") + @RequestMapping(path="add") + public ModelAndView add(ModelAndView model) { + model.setViewName(COURSE_ADD_PAGE); + model.addObject("subjectList", iSubjectService.selectList(Condition.create().eq("status", SubjectStatusEnum.NORMAL.getValue()))); + return model; + } + + @SuppressWarnings("unchecked") + @RequestMapping(path="update") + public ModelAndView update(String uid, ModelAndView model) { + model.setViewName(COURSE_UPDATE_PAGE); + model.addObject("subjectList", iSubjectService.selectList(Condition.create().eq("status", SubjectStatusEnum.NORMAL.getValue()))); + model.addObject("course", iCourseService.selectById(uid)); return model; } @RequestMapping(path="listData",method=RequestMethod.POST) @ResponseBody - public Map listData(SubjectCondition condition) { + public Map listData(CourseCondition condition) { Page page = iCourseService.listData(condition); return Result.jqGridResult(page.getRecords(), page.getTotal(), page.getSize(), page.getCurrent(), page.getPages()); } + + @RequestMapping(path="save",method=RequestMethod.POST) + @ResponseBody + public Result save(CourseEntity course) { + try { + iCourseService.save(course); + return Result.result(0, null, "保存科目【"+course.getName()+"】成功"); + } catch (Exception e) { + return ExceptionSupport.resolverResult("保存科目", this.getClass(), e); + } + } + + @RequestMapping(path="update",method=RequestMethod.POST) + @ResponseBody + public Result update(CourseEntity course) { + try { + iCourseService.update(course); + return Result.result(0, null, "修改科目【"+course.getName()+"】成功"); + } catch (Exception e) { + return ExceptionSupport.resolverResult("修改科目", this.getClass(), e); + } + } } diff --git a/tamguo-oms/src/main/resources/templates/modules/tiku/course/add.html b/tamguo-oms/src/main/resources/templates/modules/tiku/course/add.html new file mode 100644 index 0000000..c6858ee --- /dev/null +++ b/tamguo-oms/src/main/resources/templates/modules/tiku/course/add.html @@ -0,0 +1,125 @@ + +科目管理 - JeeSite Demo + + + + + + + + + + + + +
+
+
+
+ 新增科目 +
+
+ +
+
+
+
+
基本信息
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+   + +
+
+
+
+
+
+
+ + + + + + + + + + + + + + \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/templates/modules/tiku/course/list.html b/tamguo-oms/src/main/resources/templates/modules/tiku/course/list.html index 7669dc8..c2fc52b 100644 --- a/tamguo-oms/src/main/resources/templates/modules/tiku/course/list.html +++ b/tamguo-oms/src/main/resources/templates/modules/tiku/course/list.html @@ -42,6 +42,16 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/> +
+ +
+ +
+
+
@@ -82,7 +92,7 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ {header:'类型名称', name:'name', index:'a.post_name', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){ - return ''+(val||row.uid)+''; + return ''+(val||row.uid)+''; }}, {header:'类型编码', name:'uid', index:'a.post_code', width:200, align:"center"}, {header:'排序号', name:'sort', index:'a.post_sort', width:80, align:"center"}, @@ -99,14 +109,14 @@ $('#dataGrid').dataGrid({ }}, {header:'操作', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){ var actions = []; - actions.push(' '); + actions.push(' '); if (row.status == "normal"){ - actions.push(' '); + actions.push(' '); } if (row.status == "disabled"){ - actions.push(' '); + actions.push(' '); } - actions.push(' '); + actions.push(' '); return actions.join(''); }} ], diff --git a/tamguo-oms/src/main/resources/templates/modules/tiku/course/update.html b/tamguo-oms/src/main/resources/templates/modules/tiku/course/update.html new file mode 100644 index 0000000..6d2800e --- /dev/null +++ b/tamguo-oms/src/main/resources/templates/modules/tiku/course/update.html @@ -0,0 +1,125 @@ + +科目管理 - JeeSite Demo + + + + + + + + + + + + +
+
+
+
+ 编辑科目 +
+
+ +
+
+
+
+
基本信息
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+   + +
+
+
+
+
+
+
+ + + + + + + + + + + + + + \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/templates/modules/tiku/subject/add.html b/tamguo-oms/src/main/resources/templates/modules/tiku/subject/add.html index b395d2c..ec729c7 100644 --- a/tamguo-oms/src/main/resources/templates/modules/tiku/subject/add.html +++ b/tamguo-oms/src/main/resources/templates/modules/tiku/subject/add.html @@ -102,7 +102,7 @@ $("#inputForm").validate({ submitHandler: function(form){ js.ajaxSubmitForm($(form), function(data){ js.showMessage(data.message); - if(data.result == Global.TRUE){ + if(data.code == 0){ js.closeCurrentTabPage(function(contentWindow){ contentWindow.page(); });