yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023年4月1日 更改版本

This commit is contained in:
bai 2023-04-01 22:06:58 +08:00
parent 697fe4637b
commit 19cbaae9f9
10 changed files with 78 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java
View File

@ -38,12 +38,12 @@ import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
* @Description: 课程管理
* @Description: 课程管理-主表
* @Author: jeecg-boot
* @Date: 2023-03-30
* @Date: 2023-04-01
* @Version: V1.0
*/
@Api(tags="课程管理")
@Api(tags="课程管理-主表")
@RestController
@RequestMapping("/ktgl/kcKechengbiao")
@Slf4j
@ -60,8 +60,8 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
* @param req
* @return
*/
//@AutoLog(value = "课程管理-分页列表查询")
@ApiOperation(value="课程管理-分页列表查询", notes="课程管理-分页列表查询")
//@AutoLog(value = "课程管理-主表-分页列表查询")
@ApiOperation(value="课程管理-主表-分页列表查询", notes="课程管理-主表-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<KcKechengbiao>> queryPageList(KcKechengbiao kcKechengbiao,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@ -79,8 +79,8 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
* @param kcKechengbiao
* @return
*/
@AutoLog(value = "课程管理-添加")
@ApiOperation(value="课程管理-添加", notes="课程管理-添加")
@AutoLog(value = "课程管理-主表-添加")
@ApiOperation(value="课程管理-主表-添加", notes="课程管理-主表-添加")
@RequiresPermissions("ktgl:kc_kechengbiao:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody KcKechengbiao kcKechengbiao) {
@ -94,8 +94,8 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
* @param kcKechengbiao
* @return
*/
@AutoLog(value = "课程管理-编辑")
@ApiOperation(value="课程管理-编辑", notes="课程管理-编辑")
@AutoLog(value = "课程管理-主表-编辑")
@ApiOperation(value="课程管理-主表-编辑", notes="课程管理-主表-编辑")
@RequiresPermissions("ktgl:kc_kechengbiao:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody KcKechengbiao kcKechengbiao) {
@ -109,8 +109,8 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
* @param id
* @return
*/
@AutoLog(value = "课程管理-通过id删除")
@ApiOperation(value="课程管理-通过id删除", notes="课程管理-通过id删除")
@AutoLog(value = "课程管理-主表-通过id删除")
@ApiOperation(value="课程管理-主表-通过id删除", notes="课程管理-主表-通过id删除")
@RequiresPermissions("ktgl:kc_kechengbiao:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@ -124,8 +124,8 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
* @param ids
* @return
*/
@AutoLog(value = "课程管理-批量删除")
@ApiOperation(value="课程管理-批量删除", notes="课程管理-批量删除")
@AutoLog(value = "课程管理-主表-批量删除")
@ApiOperation(value="课程管理-主表-批量删除", notes="课程管理-主表-批量删除")
@RequiresPermissions("ktgl:kc_kechengbiao:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@ -139,8 +139,8 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
* @param id
* @return
*/
//@AutoLog(value = "课程管理-通过id查询")
@ApiOperation(value="课程管理-通过id查询", notes="课程管理-通过id查询")
//@AutoLog(value = "课程管理-主表-通过id查询")
@ApiOperation(value="课程管理-主表-通过id查询", notes="课程管理-主表-通过id查询")
@GetMapping(value = "/queryById")
public Result<KcKechengbiao> queryById(@RequestParam(name="id",required=true) String id) {
KcKechengbiao kcKechengbiao = kcKechengbiaoService.getById(id);
@ -159,7 +159,7 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
@RequiresPermissions("ktgl:kc_kechengbiao:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, KcKechengbiao kcKechengbiao) {
return super.exportXls(request, kcKechengbiao, KcKechengbiao.class, "课程管理");
return super.exportXls(request, kcKechengbiao, KcKechengbiao.class, "课程管理-主表");
}
/**

47
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java
View File

@ -1,10 +1,17 @@
package org.jeecg.modules.kc.ktgl.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService;
@ -13,22 +20,30 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
* @Description: 课堂
* @Description: 课堂管理-子表
* @Author: jeecg-boot
* @Date: 2023-03-29
* @Date: 2023-04-01
* @Version: V1.0
*/
@Api(tags="课堂")
@Api(tags="课堂管理-子表")
@RestController
@RequestMapping("/ktgl/kcKetangbiao")
@Slf4j
@ -45,8 +60,8 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
* @param req
* @return
*/
//@AutoLog(value = "课堂-分页列表查询")
@ApiOperation(value="课堂-分页列表查询", notes="课堂-分页列表查询")
//@AutoLog(value = "课堂管理-子表-分页列表查询")
@ApiOperation(value="课堂管理-子表-分页列表查询", notes="课堂管理-子表-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<KcKetangbiao>> queryPageList(KcKetangbiao kcKetangbiao,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@ -64,8 +79,8 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
* @param kcKetangbiao
* @return
*/
@AutoLog(value = "课堂-添加")
@ApiOperation(value="课堂-添加", notes="课堂-添加")
@AutoLog(value = "课堂管理-子表-添加")
@ApiOperation(value="课堂管理-子表-添加", notes="课堂管理-子表-添加")
@RequiresPermissions("ktgl:kc_ketangbiao:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody KcKetangbiao kcKetangbiao) {
@ -79,8 +94,8 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
* @param kcKetangbiao
* @return
*/
@AutoLog(value = "课堂-编辑")
@ApiOperation(value="课堂-编辑", notes="课堂-编辑")
@AutoLog(value = "课堂管理-子表-编辑")
@ApiOperation(value="课堂管理-子表-编辑", notes="课堂管理-子表-编辑")
@RequiresPermissions("ktgl:kc_ketangbiao:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody KcKetangbiao kcKetangbiao) {
@ -94,8 +109,8 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
* @param id
* @return
*/
@AutoLog(value = "课堂-通过id删除")
@ApiOperation(value="课堂-通过id删除", notes="课堂-通过id删除")
@AutoLog(value = "课堂管理-子表-通过id删除")
@ApiOperation(value="课堂管理-子表-通过id删除", notes="课堂管理-子表-通过id删除")
@RequiresPermissions("ktgl:kc_ketangbiao:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@ -109,8 +124,8 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
* @param ids
* @return
*/
@AutoLog(value = "课堂-批量删除")
@ApiOperation(value="课堂-批量删除", notes="课堂-批量删除")
@AutoLog(value = "课堂管理-子表-批量删除")
@ApiOperation(value="课堂管理-子表-批量删除", notes="课堂管理-子表-批量删除")
@RequiresPermissions("ktgl:kc_ketangbiao:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@ -124,8 +139,8 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
* @param id
* @return
*/
//@AutoLog(value = "课堂-通过id查询")
@ApiOperation(value="课堂-通过id查询", notes="课堂-通过id查询")
//@AutoLog(value = "课堂管理-子表-通过id查询")
@ApiOperation(value="课堂管理-子表-通过id查询", notes="课堂管理-子表-通过id查询")
@GetMapping(value = "/queryById")
public Result<KcKetangbiao> queryById(@RequestParam(name="id",required=true) String id) {
KcKetangbiao kcKetangbiao = kcKetangbiaoService.getById(id);
@ -144,7 +159,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
@RequiresPermissions("ktgl:kc_ketangbiao:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, KcKetangbiao kcKetangbiao) {
return super.exportXls(request, kcKetangbiao, KcKetangbiao.class, "课堂");
return super.exportXls(request, kcKetangbiao, KcKetangbiao.class, "课堂管理-子表");
}
/**

18
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiao.java
View File

@ -19,16 +19,16 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 课程管理
* @Description: 课程管理-主表
* @Author: jeecg-boot
* @Date: 2023-03-30
* @Date: 2023-04-01
* @Version: V1.0
*/
@Data
@TableName("kc_kechengbiao")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="kc_kechengbiao对象", description="课程管理")
@ApiModel(value="kc_kechengbiao对象", description="课程管理-主表")
public class KcKechengbiao implements Serializable {
private static final long serialVersionUID = 1L;
@ -88,7 +88,8 @@ public class KcKechengbiao implements Serializable {
@ApiModelProperty(value = "开课单位")
private java.lang.String kkdw;
/**课程性质*/
@Excel(name = "课程性质", width = 15)
@Excel(name = "课程性质", width = 15, dicCode = "kcxz")
@Dict(dicCode = "kcxz")
@ApiModelProperty(value = "课程性质")
private java.lang.String kcxz;
/**上课地点*/
@ -104,11 +105,13 @@ public class KcKechengbiao implements Serializable {
@ApiModelProperty(value = "上课周次")
private java.lang.String jkzc;
/**节次*/
@Excel(name = "节次", width = 15)
@Excel(name = "节次", width = 15, dicCode = "skjc")
@Dict(dicCode = "skjc")
@ApiModelProperty(value = "节次")
private java.lang.String hh;
/**星期几*/
@Excel(name = "星期几", width = 15)
@Excel(name = "周几", width = 15, dicCode = "week")
@Dict(dicCode = "week")
@ApiModelProperty(value = "星期几")
private java.lang.String week;
/**课程开始时间*/
@ -132,7 +135,8 @@ public class KcKechengbiao implements Serializable {
@ApiModelProperty(value = "课程结束日期")
private java.lang.String wwjs;
/**直播方式*/
@Excel(name = "直播方式", width = 15)
@Excel(name = "直播方式", width = 15, dicCode = "skpt")
@Dict(dicCode = "skpt")
@ApiModelProperty(value = "直播方式")
private java.lang.String zbfs;
/**会议号*/

10
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java
View File

@ -19,16 +19,16 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 课堂
* @Description: 课堂管理-子表
* @Author: jeecg-boot
* @Date: 2023-03-29
* @Date: 2023-04-01
* @Version: V1.0
*/
@Data
@TableName("kc_ketangbiao")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="kc_ketangbiao对象", description="课堂")
@ApiModel(value="kc_ketangbiao对象", description="课堂管理-子表")
public class KcKetangbiao implements Serializable {
private static final long serialVersionUID = 1L;
@ -174,7 +174,7 @@ public class KcKetangbiao implements Serializable {
/**开课单位id*/
@Excel(name = "开课单位id", width = 15)
@ApiModelProperty(value = "开课单位id")
private java.lang.String kkdwid;
private java.lang.Integer kkdwid;
/**上课日期*/
@Excel(name = "上课日期", width = 15)
@ApiModelProperty(value = "上课日期")
@ -182,7 +182,7 @@ public class KcKetangbiao implements Serializable {
/**课程表id*/
@Excel(name = "课程表id", width = 15)
@ApiModelProperty(value = "课程表id")
private java.lang.String kechengbiaoid;
private java.lang.Integer kechengbiaoid;
/**听课次数*/
@Excel(name = "听课次数", width = 15)
@ApiModelProperty(value = "听课次数")

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java
View File

@ -7,9 +7,9 @@ import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 课程管理
* @Description: 课程管理-主表
* @Author: jeecg-boot
* @Date: 2023-03-30
* @Date: 2023-04-01
* @Version: V1.0
*/
public interface KcKechengbiaoMapper extends BaseMapper<KcKechengbiao> {

7
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java
View File

@ -1,12 +1,15 @@
package org.jeecg.modules.kc.ktgl.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 课堂
* @Description: 课堂管理-子表
* @Author: jeecg-boot
* @Date: 2023-03-29
* @Date: 2023-04-01
* @Version: V1.0
*/
public interface KcKetangbiaoMapper extends BaseMapper<KcKetangbiao> {

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java
View File

@ -4,9 +4,9 @@ import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 课程管理
* @Description: 课程管理-主表
* @Author: jeecg-boot
* @Date: 2023-03-30
* @Date: 2023-04-01
* @Version: V1.0
*/
public interface IKcKechengbiaoService extends IService<KcKechengbiao> {

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java
View File

@ -4,9 +4,9 @@ import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 课堂
* @Description: 课堂管理-子表
* @Author: jeecg-boot
* @Date: 2023-03-29
* @Date: 2023-04-01
* @Version: V1.0
*/
public interface IKcKetangbiaoService extends IService<KcKetangbiao> {

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java
View File

@ -8,9 +8,9 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 课程管理
* @Description: 课程管理-主表
* @Author: jeecg-boot
* @Date: 2023-03-30
* @Date: 2023-04-01
* @Version: V1.0
*/
@Service

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java
View File

@ -8,9 +8,9 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 课堂
* @Description: 课堂管理-子表
* @Author: jeecg-boot
* @Date: 2023-03-29
* @Date: 2023-04-01
* @Version: V1.0
*/
@Service