diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ApplicationMergeTeacherOpenCourseDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ApplicationMergeTeacherOpenCourseDao.java deleted file mode 100644 index c080c82a..00000000 --- a/web/src/main/java/com/ibeetl/jlw/dao/ApplicationMergeTeacherOpenCourseDao.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.ibeetl.jlw.dao; - -import com.ibeetl.jlw.entity.ApplicationMergeTeacherOpenCourse; -import com.ibeetl.jlw.web.query.ApplicationMergeTeacherOpenCourseQuery; -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.applicationMergeTeacherOpenCourse") -public interface ApplicationMergeTeacherOpenCourseDao extends BaseMapper{ - PageQuery queryByCondition(PageQuery query); - PageQuery queryByConditionQuery(PageQuery query); - @Update - void deleteApplicationMergeTeacherOpenCourseByIds(String ids); - @Update - int updateGivenByIds(ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery); - List getByIds(String ids); - List getValuesByQuery(ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery); - List getValuesByQueryNotWithPermission(ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery); -} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ApplicationMergeTeacherOpenCourse.java b/web/src/main/java/com/ibeetl/jlw/entity/ApplicationMergeTeacherOpenCourse.java deleted file mode 100644 index bf2964db..00000000 --- a/web/src/main/java/com/ibeetl/jlw/entity/ApplicationMergeTeacherOpenCourse.java +++ /dev/null @@ -1,141 +0,0 @@ -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 org.beetl.sql.fetch.annotation.Fetch; -import org.beetl.sql.fetch.annotation.FetchOne; - -import javax.validation.constraints.NotNull; -import java.util.Date; - -/* -* 应用-关联-课程开课 -* gen by Spring Boot2 Admin 2022-10-20 -*/ -@Fetch -public class ApplicationMergeTeacherOpenCourse extends BaseEntity{ - - //应用-开课关联ID - @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - // @SeqID(name = ORACLE_CORE_SEQ_NAME) - @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.ApplicationMergeTeacherOpenCourse") - - private Long applicationMergeTeacherOpenCourseId ; - - //应用ID - @Dict(type="resources_application.application_name.1=1") - - private Long resourcesApplicationId ; - - @FetchOne("resourcesApplicationId") - private ResourcesApplication resourcesApplication; - - //教师开课ID - @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") - - private Long teacherOpenCourseId ; - - //创建时间 - - private Date applicationMergeTeacherOpenCourseAddTime ; - - //组织ID - - private Long orgId ; - - //用户ID - - private Long userId ; - - public ApplicationMergeTeacherOpenCourse(){ - } - - /**应用-开课关联ID - *@return - */ - public Long getApplicationMergeTeacherOpenCourseId(){ - return applicationMergeTeacherOpenCourseId; - } - /**应用-开课关联ID - *@param applicationMergeTeacherOpenCourseId - */ - public void setApplicationMergeTeacherOpenCourseId(Long applicationMergeTeacherOpenCourseId){ - this.applicationMergeTeacherOpenCourseId = applicationMergeTeacherOpenCourseId; - } - - /**应用ID - *@return - */ - public Long getResourcesApplicationId(){ - return resourcesApplicationId; - } - /**应用ID - *@param resourcesApplicationId - */ - public void setResourcesApplicationId(Long resourcesApplicationId){ - this.resourcesApplicationId = resourcesApplicationId; - } - - /**教师开课ID - *@return - */ - public Long getTeacherOpenCourseId(){ - return teacherOpenCourseId; - } - /**教师开课ID - *@param teacherOpenCourseId - */ - public void setTeacherOpenCourseId(Long teacherOpenCourseId){ - this.teacherOpenCourseId = teacherOpenCourseId; - } - - /**创建时间 - *@return - */ - public Date getApplicationMergeTeacherOpenCourseAddTime(){ - return applicationMergeTeacherOpenCourseAddTime; - } - /**创建时间 - *@param applicationMergeTeacherOpenCourseAddTime - */ - public void setApplicationMergeTeacherOpenCourseAddTime(Date applicationMergeTeacherOpenCourseAddTime){ - this.applicationMergeTeacherOpenCourseAddTime = applicationMergeTeacherOpenCourseAddTime; - } - - /**组织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; - } - - - public ResourcesApplication getResourcesApplication() { - return resourcesApplication; - } - - public void setResourcesApplication(ResourcesApplication resourcesApplication) { - this.resourcesApplication = resourcesApplication; - } -} diff --git a/web/src/main/java/com/ibeetl/jlw/service/ApplicationMergeTeacherOpenCourseService.java b/web/src/main/java/com/ibeetl/jlw/service/ApplicationMergeTeacherOpenCourseService.java deleted file mode 100644 index dd361598..00000000 --- a/web/src/main/java/com/ibeetl/jlw/service/ApplicationMergeTeacherOpenCourseService.java +++ /dev/null @@ -1,153 +0,0 @@ -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.ApplicationMergeTeacherOpenCourseDao; -import com.ibeetl.jlw.entity.ApplicationMergeTeacherOpenCourse; -import com.ibeetl.jlw.web.query.ApplicationMergeTeacherOpenCourseQuery; -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 org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * 开课关联应用 Service - * 当分布式ID开启后请勿使用insert(*,true) - */ - -@Service -@Transactional -@Validated -public class ApplicationMergeTeacherOpenCourseService extends CoreBaseService{ - - @Resource private ApplicationMergeTeacherOpenCourseDao applicationMergeTeacherOpenCourseDao; - - public PageQueryqueryByCondition(PageQuery query){ - PageQuery ret = applicationMergeTeacherOpenCourseDao.queryByCondition(query); - queryListAfter(ret.getList()); - return ret; - } - - public PageQueryqueryByConditionQuery(PageQuery query){ - PageQuery ret = applicationMergeTeacherOpenCourseDao.queryByConditionQuery(query); - queryListAfter(ret.getList()); - return ret; - } - - public void deleteByList(List list){ - String ids = ""; - ToolUtils.deleteNullList(list); - for(int i=0;null != list && i applicationMergeTeacherOpenCourseList = new ArrayList<>(); - try { - applicationMergeTeacherOpenCourseList = JSON.parseArray(applicationMergeTeacherOpenCourseQuery.getApplicationMergeTeacherOpenCourseJsonStr(), ApplicationMergeTeacherOpenCourse.class); - } catch (Exception e) { - try { - applicationMergeTeacherOpenCourseList.add(JSONObject.parseObject(applicationMergeTeacherOpenCourseQuery.getApplicationMergeTeacherOpenCourseJsonStr(), ApplicationMergeTeacherOpenCourse.class)); - } catch (Exception e1) {} - } - ToolUtils.deleteNullList(applicationMergeTeacherOpenCourseList); - if(null != applicationMergeTeacherOpenCourseList && applicationMergeTeacherOpenCourseList.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.applicationMergeTeacherOpenCourse.getApplicationMergeTeacherOpenCourseValues"), ApplicationMergeTeacherOpenCourse.class, paras); - } - - public List getValuesByQuery (ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery){ - return applicationMergeTeacherOpenCourseDao.getValuesByQuery(applicationMergeTeacherOpenCourseQuery); - } - - public List getValuesByQueryNotWithPermission (ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery){ - return applicationMergeTeacherOpenCourseDao.getValuesByQueryNotWithPermission(applicationMergeTeacherOpenCourseQuery); - } - - public ApplicationMergeTeacherOpenCourse getInfo (Long applicationMergeTeacherOpenCourseId){ - ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery = new ApplicationMergeTeacherOpenCourseQuery(); - applicationMergeTeacherOpenCourseQuery.setApplicationMergeTeacherOpenCourseId(applicationMergeTeacherOpenCourseId); - List list = applicationMergeTeacherOpenCourseDao.getValuesByQuery(applicationMergeTeacherOpenCourseQuery); - if(null != list && list.size()>0){ - return list.get(0); - }else{ - return null; - } - } - - public ApplicationMergeTeacherOpenCourse getInfo (ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery){ - List list = applicationMergeTeacherOpenCourseDao.getValuesByQuery(applicationMergeTeacherOpenCourseQuery); - if(null != list && list.size()>0){ - return list.get(0); - }else{ - return null; - } - } - -} diff --git a/web/src/main/java/com/ibeetl/jlw/web/ApplicationMergeTeacherOpenCourseController.java b/web/src/main/java/com/ibeetl/jlw/web/ApplicationMergeTeacherOpenCourseController.java deleted file mode 100644 index f2c7df2f..00000000 --- a/web/src/main/java/com/ibeetl/jlw/web/ApplicationMergeTeacherOpenCourseController.java +++ /dev/null @@ -1,194 +0,0 @@ -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.ApplicationMergeTeacherOpenCourse; -import com.ibeetl.jlw.service.ApplicationMergeTeacherOpenCourseService; -import com.ibeetl.jlw.web.query.ApplicationMergeTeacherOpenCourseQuery; -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 -@Validated -public class ApplicationMergeTeacherOpenCourseController{ - - private final Log log = LogFactory.getLog(this.getClass()); - private static final String MODEL = "/jlw/applicationMergeTeacherOpenCourse"; - private static final String API = "/api/applicationMergeTeacherOpenCourse"; - - - @Resource private ApplicationMergeTeacherOpenCourseService applicationMergeTeacherOpenCourseService; - - @Resource FileService fileService; - - /* 前端接口 */ - - @PostMapping(API + "/getPageList.do") - public JsonResult getPageList(ApplicationMergeTeacherOpenCourseQuery condition,@SCoreUser CoreUser coreUser){ - if(null == coreUser){ - return JsonResult.failMessage("请登录后再操作"); - }else{ - PageQuery page = condition.getPageQuery(); - applicationMergeTeacherOpenCourseService.queryByConditionQuery(page); - return JsonResult.success(page); - } - } - - - @GetMapping(API + "/getInfo.do") - public JsonResultgetInfo(ApplicationMergeTeacherOpenCourseQuery param,@SCoreUser CoreUser coreUser) { - if(null == coreUser){ - return JsonResult.failMessage("请登录后再操作"); - }else{ - ApplicationMergeTeacherOpenCourse applicationMergeTeacherOpenCourse = applicationMergeTeacherOpenCourseService.getInfo(param); - return JsonResult.success(applicationMergeTeacherOpenCourse); - } - } - - - @GetMapping(API + "/getList.do") - public JsonResult>getList(ApplicationMergeTeacherOpenCourseQuery param,@SCoreUser CoreUser coreUser) { - if(null == coreUser){ - return JsonResult.failMessage("请登录后再操作"); - }else{ - Listlist = applicationMergeTeacherOpenCourseService.getValuesByQuery(param); - return JsonResult.success(list); - } - } - - - /* 后台页面 */ - - @GetMapping(MODEL + "/index.do") - @Function("applicationMergeTeacherOpenCourse.query") - public ModelAndView index() { - ModelAndView view = new ModelAndView("/jlw/applicationMergeTeacherOpenCourse/index.html") ; - view.addObject("search", ApplicationMergeTeacherOpenCourseQuery.class.getName()); - return view; - } - - @GetMapping(MODEL + "/edit.do") - @Function("applicationMergeTeacherOpenCourse.edit") - public ModelAndView edit(Long applicationMergeTeacherOpenCourseId) { - ModelAndView view = new ModelAndView("/jlw/applicationMergeTeacherOpenCourse/edit.html"); - ApplicationMergeTeacherOpenCourse applicationMergeTeacherOpenCourse = applicationMergeTeacherOpenCourseService.queryById(applicationMergeTeacherOpenCourseId); - view.addObject("applicationMergeTeacherOpenCourse", applicationMergeTeacherOpenCourse); - return view; - } - - @GetMapping(MODEL + "/add.do") - @Function("applicationMergeTeacherOpenCourse.add") - public ModelAndView add(Long applicationMergeTeacherOpenCourseId) { - ModelAndView view = new ModelAndView("/jlw/applicationMergeTeacherOpenCourse/add.html"); - if(null != applicationMergeTeacherOpenCourseId){ - ApplicationMergeTeacherOpenCourse applicationMergeTeacherOpenCourse = applicationMergeTeacherOpenCourseService.queryById(applicationMergeTeacherOpenCourseId); - view.addObject("applicationMergeTeacherOpenCourse", applicationMergeTeacherOpenCourse); - }else { - view.addObject("applicationMergeTeacherOpenCourse", new ApplicationMergeTeacherOpenCourse()); - } - return view; - } - - /* 后台接口 */ - - @PostMapping(MODEL + "/list.json") - @Function("applicationMergeTeacherOpenCourse.query") - public JsonResult list(ApplicationMergeTeacherOpenCourseQuery condition){ - PageQuery page = condition.getPageQuery(); - applicationMergeTeacherOpenCourseService.queryByCondition(page); - return JsonResult.success(page); - } - - @PostMapping(MODEL + "/addAll.json") - @Function("applicationMergeTeacherOpenCourse.add") - public JsonResult addAll(ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery,@SCoreUser CoreUser coreUser){ - if(null == coreUser){ - return JsonResult.failMessage("请登录后再操作"); - }else{ - applicationMergeTeacherOpenCourseQuery.setUserId(coreUser.getId()); - applicationMergeTeacherOpenCourseQuery.setOrgId(coreUser.getOrgId()); - String msg = applicationMergeTeacherOpenCourseService.addAll(applicationMergeTeacherOpenCourseQuery); - if (StringUtils.isBlank(msg)) { - return JsonResult.success(); - } else { - return JsonResult.failMessage("新增失败,"+msg); - } - } - } - - @PostMapping(MODEL + "/add.json") - @Function("applicationMergeTeacherOpenCourse.add") - public JsonResult add(@Validated(ValidateConfig.ADD.class) ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery, BindingResult result,@SCoreUser CoreUser coreUser){ - if(result.hasErrors()){ - return JsonResult.failMessage(result); - }else{ - applicationMergeTeacherOpenCourseQuery.setUserId(coreUser.getId()); - applicationMergeTeacherOpenCourseQuery.setOrgId(coreUser.getOrgId()); - return applicationMergeTeacherOpenCourseService.add(applicationMergeTeacherOpenCourseQuery); - } - } - - @PostMapping(MODEL + "/edit.json") - @Function("applicationMergeTeacherOpenCourse.edit") - public JsonResult update(@Validated(ValidateConfig.UPDATE.class) ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery, BindingResult result) { - if(result.hasErrors()){ - return JsonResult.failMessage(result); - }else { - applicationMergeTeacherOpenCourseQuery.setUserId(null); - applicationMergeTeacherOpenCourseQuery.setOrgId(null); - String msg = applicationMergeTeacherOpenCourseService.edit(applicationMergeTeacherOpenCourseQuery); - if (StringUtils.isBlank(msg)) { - return JsonResult.success(); - } else { - return JsonResult.failMessage("更新失败,"+msg); - } - } - } - - - @GetMapping(MODEL + "/view.json") - @Function("applicationMergeTeacherOpenCourse.query") - public JsonResultqueryInfo(Long applicationMergeTeacherOpenCourseId) { - ApplicationMergeTeacherOpenCourse applicationMergeTeacherOpenCourse = applicationMergeTeacherOpenCourseService.queryById( applicationMergeTeacherOpenCourseId); - return JsonResult.success(applicationMergeTeacherOpenCourse); - } - - @GetMapping(MODEL + "/getValues.json") - @Function("applicationMergeTeacherOpenCourse.query") - public JsonResult>getValues(ApplicationMergeTeacherOpenCourseQuery param) { - Listlist = applicationMergeTeacherOpenCourseService.getValuesByQuery(param); - return JsonResult.success(list); - } - - - @PostMapping(MODEL + "/delete.json") - @Function("applicationMergeTeacherOpenCourse.delete") - @ResponseBody - public JsonResult delete(String ids) { - applicationMergeTeacherOpenCourseService.deleteApplicationMergeTeacherOpenCourse(ids); - return JsonResult.success(); - } - - -} diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ApplicationMergeTeacherOpenCourseQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ApplicationMergeTeacherOpenCourseQuery.java deleted file mode 100644 index 83e27d79..00000000 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ApplicationMergeTeacherOpenCourseQuery.java +++ /dev/null @@ -1,129 +0,0 @@ -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.ApplicationMergeTeacherOpenCourse; - -import javax.validation.constraints.NotNull; -import java.util.Date; - -/** - *开课关联应用查询 - */ -public class ApplicationMergeTeacherOpenCourseQuery extends PageParam { - @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - @Query(name = "应用-开课关联ID", display = false) - private Long applicationMergeTeacherOpenCourseId; - @Query(name = "应用ID", display = true,type=Query.TYPE_DICT,dict="resources_application.application_name.1=1") - private Long resourcesApplicationId; - @Query(name = "教师开课ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") - private Long teacherOpenCourseId; - @Query(name = "创建时间", display = false) - private Date applicationMergeTeacherOpenCourseAddTime; - @Query(name = "组织ID", display = false) - private Long orgId; - @Query(name = "用户ID", display = false) - private Long userId; - - private String applicationMergeTeacherOpenCourseIdPlural; - private String resourcesApplicationIdPlural; - private String teacherOpenCourseIdPlural; - private String orgIdPlural; - private String userIdPlural; - - private String applicationMergeTeacherOpenCourseJsonStr;//json格式 - - private String _given;//指定更新的特定字段，多个逗号隔开 - - public Long getApplicationMergeTeacherOpenCourseId(){ - return applicationMergeTeacherOpenCourseId; - } - public void setApplicationMergeTeacherOpenCourseId(Long applicationMergeTeacherOpenCourseId ){ - this.applicationMergeTeacherOpenCourseId = applicationMergeTeacherOpenCourseId; - } - public Long getResourcesApplicationId(){ - return resourcesApplicationId; - } - public void setResourcesApplicationId(Long resourcesApplicationId ){ - this.resourcesApplicationId = resourcesApplicationId; - } - public Long getTeacherOpenCourseId(){ - return teacherOpenCourseId; - } - public void setTeacherOpenCourseId(Long teacherOpenCourseId ){ - this.teacherOpenCourseId = teacherOpenCourseId; - } - public Date getApplicationMergeTeacherOpenCourseAddTime(){ - return applicationMergeTeacherOpenCourseAddTime; - } - public void setApplicationMergeTeacherOpenCourseAddTime(Date applicationMergeTeacherOpenCourseAddTime ){ - this.applicationMergeTeacherOpenCourseAddTime = applicationMergeTeacherOpenCourseAddTime; - } - 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 ApplicationMergeTeacherOpenCourse pojo(){ - ApplicationMergeTeacherOpenCourse pojo = new ApplicationMergeTeacherOpenCourse(); - pojo.setApplicationMergeTeacherOpenCourseId(this.getApplicationMergeTeacherOpenCourseId()); - pojo.setResourcesApplicationId(this.getResourcesApplicationId()); - pojo.setTeacherOpenCourseId(this.getTeacherOpenCourseId()); - pojo.setApplicationMergeTeacherOpenCourseAddTime(this.getApplicationMergeTeacherOpenCourseAddTime()); - pojo.setOrgId(this.getOrgId()); - pojo.setUserId(this.getUserId()); - return pojo; - } - - public String getApplicationMergeTeacherOpenCourseIdPlural(){ - return applicationMergeTeacherOpenCourseIdPlural; - } - public void setApplicationMergeTeacherOpenCourseIdPlural(String applicationMergeTeacherOpenCourseIdPlural){ - this.applicationMergeTeacherOpenCourseIdPlural = applicationMergeTeacherOpenCourseIdPlural; - } - public String getResourcesApplicationIdPlural(){ - return resourcesApplicationIdPlural; - } - public void setResourcesApplicationIdPlural(String resourcesApplicationIdPlural){ - this.resourcesApplicationIdPlural = resourcesApplicationIdPlural; - } - public String getTeacherOpenCourseIdPlural(){ - return teacherOpenCourseIdPlural; - } - public void setTeacherOpenCourseIdPlural(String teacherOpenCourseIdPlural){ - this.teacherOpenCourseIdPlural = teacherOpenCourseIdPlural; - } - 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 getApplicationMergeTeacherOpenCourseJsonStr(){ - return applicationMergeTeacherOpenCourseJsonStr; - } - public void setApplicationMergeTeacherOpenCourseJsonStr(String applicationMergeTeacherOpenCourseJsonStr ){ - this.applicationMergeTeacherOpenCourseJsonStr = applicationMergeTeacherOpenCourseJsonStr; - } - public String get_given() { - return _given; - } - public void set_given(String _given) { - this._given = _given; - } -} diff --git a/web/src/main/resources/sql/jlw/applicationMergeTeacherOpenCourse.md b/web/src/main/resources/sql/jlw/applicationMergeTeacherOpenCourse.md deleted file mode 100644 index 481b87d4..00000000 --- a/web/src/main/resources/sql/jlw/applicationMergeTeacherOpenCourse.md +++ /dev/null @@ -1,271 +0,0 @@ -queryByCondition -=== -* 根据不为空的参数进行分页查询 - - select - @pageTag(){ - t.* - @} - from application_merge_teacher_open_course t - where 1=1 - @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行 - and #function("applicationMergeTeacherOpenCourse.query")# - @if(!isEmpty(applicationMergeTeacherOpenCourseId)){ - and t.application_merge_teacher_open_course_id =#applicationMergeTeacherOpenCourseId# - @} - @if(!isEmpty(applicationMergeTeacherOpenCourseIdPlural)){ - and find_in_set(t.application_merge_teacher_open_course_id,#applicationMergeTeacherOpenCourseIdPlural#) - @} - @if(!isEmpty(resourcesApplicationId)){ - and t.resources_application_id =#resourcesApplicationId# - @} - @if(!isEmpty(resourcesApplicationIdPlural)){ - and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#) - @} - @if(!isEmpty(teacherOpenCourseId)){ - and t.teacher_open_course_id =#teacherOpenCourseId# - @} - @if(!isEmpty(teacherOpenCourseIdPlural)){ - and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#) - @} - @if(!isEmpty(applicationMergeTeacherOpenCourseAddTime)){ - and t.application_merge_teacher_open_course_add_time =#applicationMergeTeacherOpenCourseAddTime# - @} - @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#) - @} - - -queryByConditionQuery -=== -* 根据不为空的参数进行分页查询(无权限) - - select - @pageTag(){ - t.* - @} - from application_merge_teacher_open_course t - where 1=1 - @if(!isEmpty(applicationMergeTeacherOpenCourseId)){ - and t.application_merge_teacher_open_course_id =#applicationMergeTeacherOpenCourseId# - @} - @if(!isEmpty(applicationMergeTeacherOpenCourseIdPlural)){ - and find_in_set(t.application_merge_teacher_open_course_id,#applicationMergeTeacherOpenCourseIdPlural#) - @} - @if(!isEmpty(resourcesApplicationId)){ - and t.resources_application_id =#resourcesApplicationId# - @} - @if(!isEmpty(resourcesApplicationIdPlural)){ - and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#) - @} - @if(!isEmpty(teacherOpenCourseId)){ - and t.teacher_open_course_id =#teacherOpenCourseId# - @} - @if(!isEmpty(teacherOpenCourseIdPlural)){ - and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#) - @} - @if(!isEmpty(applicationMergeTeacherOpenCourseAddTime)){ - and t.application_merge_teacher_open_course_add_time =#applicationMergeTeacherOpenCourseAddTime# - @} - @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#) - @} - - - - -deleteApplicationMergeTeacherOpenCourseByIds -=== - -* 批量删除 - - delete from application_merge_teacher_open_course where find_in_set(application_merge_teacher_open_course_id,#ids#) - - - -getByIds -=== - -select * from application_merge_teacher_open_course where find_in_set(application_merge_teacher_open_course_id,#ids#) - - -updateGivenByIds -=== - -* 批量更新指定字段，无论此字段是否有值 - - update application_merge_teacher_open_course - set - @if(contain("resourcesApplicationId",_given)){ - @if(isEmpty(resourcesApplicationId)){ - resources_application_id = null , - @}else{ - resources_application_id = #resourcesApplicationId# , - @} - @} - @if(contain("teacherOpenCourseId",_given)){ - @if(isEmpty(teacherOpenCourseId)){ - teacher_open_course_id = null , - @}else{ - teacher_open_course_id = #teacherOpenCourseId# , - @} - @} - @if(contain("applicationMergeTeacherOpenCourseAddTime",_given)){ - @if(isEmpty(applicationMergeTeacherOpenCourseAddTime)){ - application_merge_teacher_open_course_add_time = null , - @}else{ - application_merge_teacher_open_course_add_time = #applicationMergeTeacherOpenCourseAddTime# , - @} - @} - @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# , - @} - @} - application_merge_teacher_open_course_id = application_merge_teacher_open_course_id - where find_in_set(application_merge_teacher_open_course_id,#applicationMergeTeacherOpenCourseIdPlural#) - - - -getApplicationMergeTeacherOpenCourseValues -=== - -* 根据不为空的参数进行查询 - - select t.* - from application_merge_teacher_open_course t - where 1=1 - @if(!isEmpty(applicationMergeTeacherOpenCourseId)){ - and t.application_merge_teacher_open_course_id =#applicationMergeTeacherOpenCourseId# - @} - @if(!isEmpty(resourcesApplicationId)){ - and t.resources_application_id =#resourcesApplicationId# - @} - @if(!isEmpty(teacherOpenCourseId)){ - and t.teacher_open_course_id =#teacherOpenCourseId# - @} - @if(!isEmpty(applicationMergeTeacherOpenCourseAddTime)){ - and t.application_merge_teacher_open_course_add_time =#applicationMergeTeacherOpenCourseAddTime# - @} - @if(!isEmpty(orgId)){ - and t.org_id =#orgId# - @} - @if(!isEmpty(userId)){ - and t.user_id =#userId# - @} - - -getValuesByQuery -=== - -* 根据不为空的参数进行查询 - - select t.* - from application_merge_teacher_open_course t - where 1=1 and #function("applicationMergeTeacherOpenCourse.query")# - @if(!isEmpty(applicationMergeTeacherOpenCourseId)){ - and t.application_merge_teacher_open_course_id =#applicationMergeTeacherOpenCourseId# - @} - @if(!isEmpty(applicationMergeTeacherOpenCourseIdPlural)){ - and find_in_set(t.application_merge_teacher_open_course_id,#applicationMergeTeacherOpenCourseIdPlural#) - @} - @if(!isEmpty(resourcesApplicationId)){ - and t.resources_application_id =#resourcesApplicationId# - @} - @if(!isEmpty(resourcesApplicationIdPlural)){ - and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#) - @} - @if(!isEmpty(teacherOpenCourseId)){ - and t.teacher_open_course_id =#teacherOpenCourseId# - @} - @if(!isEmpty(teacherOpenCourseIdPlural)){ - and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#) - @} - @if(!isEmpty(applicationMergeTeacherOpenCourseAddTime)){ - and t.application_merge_teacher_open_course_add_time =#applicationMergeTeacherOpenCourseAddTime# - @} - @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#) - @} - - -getValuesByQueryNotWithPermission -=== - -* 根据不为空的参数进行查询（不包含权限） - - select t.* - from application_merge_teacher_open_course t - where 1=1 - @if(!isEmpty(applicationMergeTeacherOpenCourseId)){ - and t.application_merge_teacher_open_course_id =#applicationMergeTeacherOpenCourseId# - @} - @if(!isEmpty(applicationMergeTeacherOpenCourseIdPlural)){ - and find_in_set(t.application_merge_teacher_open_course_id,#applicationMergeTeacherOpenCourseIdPlural#) - @} - @if(!isEmpty(resourcesApplicationId)){ - and t.resources_application_id =#resourcesApplicationId# - @} - @if(!isEmpty(resourcesApplicationIdPlural)){ - and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#) - @} - @if(!isEmpty(teacherOpenCourseId)){ - and t.teacher_open_course_id =#teacherOpenCourseId# - @} - @if(!isEmpty(teacherOpenCourseIdPlural)){ - and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#) - @} - @if(!isEmpty(applicationMergeTeacherOpenCourseAddTime)){ - and t.application_merge_teacher_open_course_add_time =#applicationMergeTeacherOpenCourseAddTime# - @} - @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#) - @} - - - diff --git a/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/add.js b/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/add.js deleted file mode 100644 index ba298780..00000000 --- a/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/add.js +++ /dev/null @@ -1,38 +0,0 @@ -layui.define([ 'form', 'laydate', 'table','applicationMergeTeacherOpenCourseApi'], function(exports) { - var form = layui.form; - var applicationMergeTeacherOpenCourseApi = layui.applicationMergeTeacherOpenCourseApi; - 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 applicationMergeTeacherOpenCourseId = $("#addForm input[name='applicationMergeTeacherOpenCourseId']").val(); - if(!$.isEmpty(applicationMergeTeacherOpenCourseId)){ - applicationMergeTeacherOpenCourseApi.updateApplicationMergeTeacherOpenCourse($('#addForm'),function(){ - parent.window.dataReload(); - Common.info("更新成功"); - Lib.closeFrame(); - }); - }else{ - applicationMergeTeacherOpenCourseApi.addApplicationMergeTeacherOpenCourse($('#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/applicationMergeTeacherOpenCourse/applicationMergeTeacherOpenCourseApi.js b/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/applicationMergeTeacherOpenCourseApi.js deleted file mode 100644 index 1a85ed52..00000000 --- a/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/applicationMergeTeacherOpenCourseApi.js +++ /dev/null @@ -1,18 +0,0 @@ -/*访问后台的代码*/ -layui.define([], function(exports) { - var api={ - updateApplicationMergeTeacherOpenCourse:function(form,callback){ - Lib.submitForm("/jlw/applicationMergeTeacherOpenCourse/edit.json",form,{},callback) - }, - addApplicationMergeTeacherOpenCourse:function(form,callback){ - Lib.submitForm("/jlw/applicationMergeTeacherOpenCourse/add.json",form,{},callback) - }, - del:function(ids,callback){ - Common.post("/jlw/applicationMergeTeacherOpenCourse/delete.json",{"ids":ids},function(){ - callback(); - }) - } - - }; - exports('applicationMergeTeacherOpenCourseApi',api); -}); \ No newline at end of file diff --git a/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/del.js b/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/del.js deleted file mode 100644 index c76b6aca..00000000 --- a/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/del.js +++ /dev/null @@ -1,23 +0,0 @@ -layui.define(['table', 'applicationMergeTeacherOpenCourseApi'], function(exports) { - var applicationMergeTeacherOpenCourseApi = layui.applicationMergeTeacherOpenCourseApi; - var table=layui.table; - var view = { - init:function(){ - }, - delBatch:function(){ - var data = Common.getMoreDataFromTable(table,"applicationMergeTeacherOpenCourseTable"); - if(data==null){ - return ; - } - Common.openConfirm("确认要删除这些开课关联应用?",function(){ - var ids =Common.concatBatchId(data,"applicationMergeTeacherOpenCourseId"); - applicationMergeTeacherOpenCourseApi.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/applicationMergeTeacherOpenCourse/edit.js b/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/edit.js deleted file mode 100644 index 1826fda6..00000000 --- a/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/edit.js +++ /dev/null @@ -1,28 +0,0 @@ -layui.define([ 'form', 'laydate', 'table','applicationMergeTeacherOpenCourseApi'], function(exports) { - var form = layui.form; - var applicationMergeTeacherOpenCourseApi = layui.applicationMergeTeacherOpenCourseApi; - var index = layui.index; - var view = { - init:function(){ - Lib.initGenrealForm($("#updateForm"),form); - this.initSubmit(); - }, - initSubmit:function(){ - $("#updateButton").click(function(){ - form.on('submit(form)', function(){ - applicationMergeTeacherOpenCourseApi.updateApplicationMergeTeacherOpenCourse($('#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/applicationMergeTeacherOpenCourse/index.js b/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/index.js deleted file mode 100644 index 7bd216b9..00000000 --- a/web/src/main/resources/static/js/jlw/applicationMergeTeacherOpenCourse/index.js +++ /dev/null @@ -1,164 +0,0 @@ -layui.define([ 'form', 'laydate', 'table' ], function(exports) { - var form = layui.form; - var laydate = layui.laydate; - var table = layui.table; - var applicationMergeTeacherOpenCourseTable = null; - var view ={ - init:function(){ - var that = this - this.initTable(); - this.initSearchForm(); - this.initToolBar(); - window.dataReload = function(){ - Lib.doSearchForm($("#searchForm"),applicationMergeTeacherOpenCourseTable) - that.initToolBar(); - } - }, - initTable:function(){ - var sx_ = localStorage.getItem("applicationMergeTeacherOpenCourseTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存 - if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);} - applicationMergeTeacherOpenCourseTable = table.render({ - elem : '#applicationMergeTeacherOpenCourseTable', - height : Lib.getTableHeight(1), - cellMinWidth: 100, - method : 'post', - url : Common.ctxPath + '/jlw/applicationMergeTeacherOpenCourse/list.json' // 数据接口 - ,page : Lib.tablePage // 开启分页 - ,toolbar: '#toolbar_applicationMergeTeacherOpenCourse' //自定义头部左侧工具栏 - ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏 - ,limit : 10, - cols : [ [ // 表头 - { - type : 'checkbox', - - }, - { - field : 'applicationMergeTeacherOpenCourseId', - title : '应用-开课关联ID', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['applicationMergeTeacherOpenCourseId'])?false:sx_['applicationMergeTeacherOpenCourseId'], - - width : 60, - }, - { - field : 'resourcesApplicationIdText', //数据字典类型为 resources_application.application_name.1=1 - title : '应用ID', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['resourcesApplicationIdText'])?false:sx_['resourcesApplicationIdText'], - }, - { - field : 'teacherOpenCourseIdText', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1 - title : '教师开课ID', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['teacherOpenCourseIdText'])?false:sx_['teacherOpenCourseIdText'], - }, - { - field : 'applicationMergeTeacherOpenCourseAddTime', - title : '创建时间', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['applicationMergeTeacherOpenCourseAddTime'])?false:sx_['applicationMergeTeacherOpenCourseAddTime'], - }, - { - 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 : 'operation_',title : '操作',align:"center", templet: function (d) { - var htm = ''; - htm += ''; - return htm; - } - } - - ] ] - - }); - - table.on('checkbox(applicationMergeTeacherOpenCourseTable)', function(obj){ - var applicationMergeTeacherOpenCourse = obj.data; - if(obj.checked){ - //按钮逻辑Lib.buttonEnable() - }else{ - - } - }) - }, - - initSearchForm:function(){ - Lib.initSearchForm( $("#searchForm"),applicationMergeTeacherOpenCourseTable,form); - }, - - initToolBar:function(){ - toolbar = { - add: function () { - var url = "/jlw/applicationMergeTeacherOpenCourse/add.do"; - Common.openDlg(url,"开课关联应用管理>新增"); - }, - edit: function () { - var data = Common.getOneFromTable(table,"applicationMergeTeacherOpenCourseTable"); - if(data==null){ - return ; - } - var url = "/jlw/applicationMergeTeacherOpenCourse/add.do?applicationMergeTeacherOpenCourseId="+data.applicationMergeTeacherOpenCourseId; - Common.openDlg(url,"开课关联应用管理>"+data.applicationMergeTeacherOpenCourseId+">编辑"); - }, - del: function () { - layui.use(['del'], function(){ - var delView = layui.del - delView.delBatch(); - }); - }, - search: function () { - Lib.doSearchForm($("#searchForm"), applicationMergeTeacherOpenCourseTable, 1); - view.initToolBar() - }, - refresh: function () { - searchForm.reset(); - Lib.doSearchForm($("#searchForm"), applicationMergeTeacherOpenCourseTable, 1); - view.initToolBar() - }, - } - //触发事件 - $('.ext-toolbar').on('click', function() { - var type = $(this).data('type'); - toolbar[type] ? toolbar[type].call(this) : ''; - }); - - }, initTableTool: table.on('tool(applicationMergeTeacherOpenCourseTable)', function (obj) { - var data = obj.data; - if (obj.event === 'edit') { - var url = "/jlw/applicationMergeTeacherOpenCourse/add.do?applicationMergeTeacherOpenCourseId="+data.applicationMergeTeacherOpenCourseId; - Common.openDlg(url,"开课关联应用管理>"+data.applicationMergeTeacherOpenCourseId+">编辑"); - }else if(obj.event === "del"){ - layer.confirm('是否确定删除该信息？', function (index) { - var ret = Common.postAjax("/jlw/applicationMergeTeacherOpenCourse/delete.json",{ids:data.applicationMergeTeacherOpenCourseId}); - 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/applicationMergeTeacherOpenCourse/add.html b/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/add.html deleted file mode 100644 index 125431b9..00000000 --- a/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/add.html +++ /dev/null @@ -1,58 +0,0 @@ - - -
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
- - - - - - diff --git a/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/edit.html b/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/edit.html deleted file mode 100644 index 1652ace4..00000000 --- a/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/edit.html +++ /dev/null @@ -1,58 +0,0 @@ - - -
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
- - - - - - diff --git a/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/index.html b/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/index.html deleted file mode 100644 index f3449175..00000000 --- a/web/src/main/resources/templates/jlw/applicationMergeTeacherOpenCourse/index.html +++ /dev/null @@ -1,29 +0,0 @@ - - - -
- - - -