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

2023年4月20日 冲突了

This commit is contained in:
bai 2023-04-20 08:48:13 +08:00
parent bf910e45dc
commit 596d09bc34
22 changed files with 699 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java
View File

@ -44,6 +44,7 @@ public class SyncTJwXsxkb extends BaseSync {
*/
public void run(Map<String, Object> param){
QueryWrapper eqw = new QueryWrapper();
QueryWrapper dqw = new QueryWrapper();
boolean isDelete = true;
if(param != null){
if(Boolean.parseBoolean((String)param.get("isToday"))){
@ -51,6 +52,8 @@ public class SyncTJwXsxkb extends BaseSync {
String nowStr = DateTime.now().toDateStr();
eqw.apply("TIMESTAMPS >= to_date('"+nowStr+"', 'yyyy-MM-dd')");
eqw.apply("TIMESTAMPS < to_date('"+nowStr+"','yyyy-MM-dd')");
dqw.apply("TIMESTAMPS >= str_to_date('"+nowStr+"', 'yyyy-MM-dd')");
dqw.apply("TIMESTAMPS < str_to_date('"+nowStr+"','yyyy-MM-dd')");
isDelete = false;
} else if (Boolean.parseBoolean((String)param.get("isScope"))) {
//按照范围查询
@ -58,6 +61,8 @@ public class SyncTJwXsxkb extends BaseSync {
String endDate = (String)param.get("endDate");
eqw.apply("TIMESTAMPS >= to_date('"+startDate+"', 'yyyy-MM-dd')");
eqw.apply("TIMESTAMPS < to_date('"+endDate+"','yyyy-MM-dd')");
dqw.apply("TIMESTAMPS >= str_to_date('"+startDate+"', 'yyyy-MM-dd')");
dqw.apply("TIMESTAMPS < str_to_date('"+endDate+"','yyyy-MM-dd')");
isDelete = false;
} else if (Boolean.parseBoolean((String)param.get("isAll"))) {
//全部。。。
@ -71,7 +76,7 @@ public class SyncTJwXsxkb extends BaseSync {
inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbxsxkb.class)));
//保存到胃
impService.syncList(outDataList,isDelete);
impService.syncList(outDataList,dqw,isDelete);
Xxhbsynclog xxhbsynclog = new Xxhbsynclog();
xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size()));

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKckb.java
View File

@ -65,6 +65,9 @@ public class TJwKckb {
@Excel(name = "kcxz", width = 15)
@ApiModelProperty(value = "kcxz")
private java.lang.String kcxz;
/**教室编号*/
@Excel(name = "教室编号", width = 15)
private String jsbh;
/**skdd*/
@Excel(name = "skdd", width = 15)
@ApiModelProperty(value = "skdd")
@ -173,4 +176,5 @@ public class TJwKckb {
@Excel(name = "jxdgnr", width = 15)
@ApiModelProperty(value = "jxdgnr")
private java.sql.Clob jxdgnr;
}

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbkckb.java
View File

@ -80,6 +80,9 @@ public class Xxhbkckb implements Serializable {
@Excel(name = "课程性质", width = 15)
@ApiModelProperty(value = "课程性质")
private java.lang.String kcxz;
/**教室编号*/
@Excel(name = "教室编号", width = 15)
private String jsbh;
/**授课地点*/
@Excel(name = "授课地点", width = 15)
@ApiModelProperty(value = "授课地点")
@ -217,4 +220,5 @@ public class Xxhbkckb implements Serializable {
@Excel(name = "是否需要线上", width = 15)
@ApiModelProperty(value = "是否需要线上")
private java.lang.String sfxsk;
}

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbtkxxMapper.java
View File

@ -2,6 +2,7 @@ package org.jeecg.modules.kc.grab.imports.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -14,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface XxhbtkxxMapper extends BaseMapper<Xxhbtkxx> {
boolean updateToKeTang(Wrapper<Xxhbtkxx> queryWrapper);
}

10
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml
View File

@ -2,4 +2,14 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.kc.grab.imports.mapper.XxhbtkxxMapper">
<update id="updateToKeTang">
UPDATE xxhbtkxx tk, ketangbiao kt
SET kt.sftk = tk.tklx, kt.tkyy = tk.tksy, kt.bkjh = tk.bkjh
WHERE
STR_TO_DATE( tk.skrq, '%Y%m%d' ) = kt.skrq
AND tk.skrq > '20220228'
AND tk.xm = kt.skjs
AND tk.sqrdw = kt.kkdw
AND tk.jc = kt.hh
</update>
</mapper>

8
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbtkxxService.java
View File

@ -1,5 +1,6 @@
package org.jeecg.modules.kc.grab.imports.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx;
import com.baomidou.mybatisplus.extension.service.IService;
@ -28,4 +29,11 @@ public interface IXxhbtkxxService extends IService<Xxhbtkxx> {
*/
boolean syncList(Collection<Xxhbtkxx> entityList, boolean isDelete);
/**
* 更新至课堂表
* @param queryWrapper
* @return
*/
boolean updateToKeTang(Wrapper<Xxhbtkxx> queryWrapper);
}

3
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbxsxkbService.java
View File

@ -1,5 +1,6 @@
package org.jeecg.modules.kc.grab.imports.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbxsxkb;
import com.baomidou.mybatisplus.extension.service.IService;
@ -26,5 +27,5 @@ public interface IXxhbxsxkbService extends IService<Xxhbxsxkb> {
* @param isDelete
* @return
*/
boolean syncList(Collection<Xxhbxsxkb> entityList, boolean isDelete);
boolean syncList(Collection<Xxhbxsxkb> entityList, QueryWrapper queryWrapper, boolean isDelete);
}

33
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbtkxxServiceImpl.java
View File

@ -1,6 +1,8 @@
package org.jeecg.modules.kc.grab.imports.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbxsxkb;
import org.jeecg.modules.kc.grab.imports.mapper.XxhbtkxxMapper;
@ -34,6 +36,37 @@ public class XxhbtkxxServiceImpl extends ServiceImpl<XxhbtkxxMapper, Xxhbtkxx> i
if(isDelete){
baseMapper.delete(dqw);
}
// SQL1：UPDATE xxhbtkxx set jc = replace( convert(jc using ascii),'?', '')【第5-6节 -> 5-6】
UpdateWrapper<Xxhbtkxx> upw1 = new UpdateWrapper<>();
upw1.setSql("jc = replace( convert(jc using ascii),'?', '')");
update(upw1);
// SQL2：UPDATE xxhbtkxx set jc = replace( jc,'-', '、')【5-6 -> 5、6】
UpdateWrapper<Xxhbtkxx> upw2 = new UpdateWrapper<>();
upw2.setSql("jc = replace( jc,'-', '、')");
update(upw2);
//将【5、6 -> 05、06】
UpdateWrapper<Xxhbtkxx> upw3 = new UpdateWrapper<>();
upw3.setSql("jc = CONCAT("+
"CASE"+
"WHEN POSITION( '、' IN jc ) = 2 THEN concat( '0', substr( jc, 1, 1 ), '、' )"+
"WHEN POSITION( '、' IN jc ) = 3 THEN concat( '0', substr( jc, 1, 2 ), '、' )"+
"END,"+
"CASE"+
"WHEN LENGTH( jc ) - POSITION( '、' IN jc ) = 3 THEN CONCAT('0',substr( jc, POSITION( '、' IN jc )+ 1 ))"+
"WHEN LENGTH( jc ) - POSITION( '、' IN jc ) = 4 THEN CONCAT(substr( jc, POSITION( '、' IN jc )+ 1 ))"+
"END"+
")");
update(upw3);
//3、将停课信息(xxhbtkxx)更新至课堂表(ketangbiao)
updateToKeTang(new QueryWrapper<>());
return this.saveBatch(entityList, 1000);
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean updateToKeTang(Wrapper<Xxhbtkxx> queryWrapper) {
return baseMapper.updateToKeTang(queryWrapper);
}
}

7
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbxsxkbServiceImpl.java
View File

@ -23,15 +23,14 @@ public class XxhbxsxkbServiceImpl extends ServiceImpl<XxhbxsxkbMapper, Xxhbxsxkb
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbxsxkb> entityList) {
return syncList(entityList, true);
return syncList(entityList,new QueryWrapper(), true);
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbxsxkb> entityList, boolean isDelete) {
QueryWrapper dqw = new QueryWrapper();
public boolean syncList(Collection<Xxhbxsxkb> entityList,QueryWrapper queryWrapper , boolean isDelete) {
if(isDelete){
baseMapper.delete(dqw);
baseMapper.delete(queryWrapper);
}
return this.saveBatch(entityList, 1000);
}

178
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcJiaoshixinxibiaoController.java Normal file
View File

@ -0,0 +1,178 @@
package org.jeecg.modules.kc.jiaoshi.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.jiaoshi.entity.KcJiaoshixinxibiao;
import org.jeecg.modules.kc.jiaoshi.service.IKcJiaoshixinxibiaoService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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: 教室信息表
* @Author: jeecg-boot
* @Date: 2023-04-19
* @Version: V1.0
*/
@Api(tags="教室信息表")
@RestController
@RequestMapping("/jiaoshi/kcJiaoshixinxibiao")
@Slf4j
public class KcJiaoshixinxibiaoController extends JeecgController<KcJiaoshixinxibiao, IKcJiaoshixinxibiaoService> {
@Autowired
private IKcJiaoshixinxibiaoService kcJiaoshixinxibiaoService;
/**
* 分页列表查询
*
* @param kcJiaoshixinxibiao
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "教室信息表-分页列表查询")
@ApiOperation(value="教室信息表-分页列表查询", notes="教室信息表-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<KcJiaoshixinxibiao>> queryPageList(KcJiaoshixinxibiao kcJiaoshixinxibiao,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<KcJiaoshixinxibiao> queryWrapper = QueryGenerator.initQueryWrapper(kcJiaoshixinxibiao, req.getParameterMap());
Page<KcJiaoshixinxibiao> page = new Page<KcJiaoshixinxibiao>(pageNo, pageSize);
IPage<KcJiaoshixinxibiao> pageList = kcJiaoshixinxibiaoService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param kcJiaoshixinxibiao
* @return
*/
@AutoLog(value = "教室信息表-添加")
@ApiOperation(value="教室信息表-添加", notes="教室信息表-添加")
@RequiresPermissions("jiaoshi:kc_jiaoshixinxibiao:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody KcJiaoshixinxibiao kcJiaoshixinxibiao) {
kcJiaoshixinxibiaoService.save(kcJiaoshixinxibiao);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param kcJiaoshixinxibiao
* @return
*/
@AutoLog(value = "教室信息表-编辑")
@ApiOperation(value="教室信息表-编辑", notes="教室信息表-编辑")
@RequiresPermissions("jiaoshi:kc_jiaoshixinxibiao:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody KcJiaoshixinxibiao kcJiaoshixinxibiao) {
kcJiaoshixinxibiaoService.updateById(kcJiaoshixinxibiao);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "教室信息表-通过id删除")
@ApiOperation(value="教室信息表-通过id删除", notes="教室信息表-通过id删除")
@RequiresPermissions("jiaoshi:kc_jiaoshixinxibiao:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
kcJiaoshixinxibiaoService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "教室信息表-批量删除")
@ApiOperation(value="教室信息表-批量删除", notes="教室信息表-批量删除")
@RequiresPermissions("jiaoshi:kc_jiaoshixinxibiao:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.kcJiaoshixinxibiaoService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "教室信息表-通过id查询")
@ApiOperation(value="教室信息表-通过id查询", notes="教室信息表-通过id查询")
@GetMapping(value = "/queryById")
public Result<KcJiaoshixinxibiao> queryById(@RequestParam(name="id",required=true) String id) {
KcJiaoshixinxibiao kcJiaoshixinxibiao = kcJiaoshixinxibiaoService.getById(id);
if(kcJiaoshixinxibiao==null) {
return Result.error("未找到对应数据");
}
return Result.OK(kcJiaoshixinxibiao);
}
/**
* 导出excel
*
* @param request
* @param kcJiaoshixinxibiao
*/
@RequiresPermissions("jiaoshi:kc_jiaoshixinxibiao:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, KcJiaoshixinxibiao kcJiaoshixinxibiao) {
return super.exportXls(request, kcJiaoshixinxibiao, KcJiaoshixinxibiao.class, "教室信息表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("jiaoshi:kc_jiaoshixinxibiao:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, KcJiaoshixinxibiao.class);
}
}

178
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java Normal file
View File

@ -0,0 +1,178 @@
package org.jeecg.modules.kc.jiaoshi.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.jiaoshi.entity.KcZhihuijiaoshi;
import org.jeecg.modules.kc.jiaoshi.service.IKcZhihuijiaoshiService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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: 智慧教室
* @Author: jeecg-boot
* @Date: 2023-04-19
* @Version: V1.0
*/
@Api(tags="智慧教室")
@RestController
@RequestMapping("/jiaoshi/kcZhihuijiaoshi")
@Slf4j
public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi, IKcZhihuijiaoshiService> {
@Autowired
private IKcZhihuijiaoshiService kcZhihuijiaoshiService;
/**
* 分页列表查询
*
* @param kcZhihuijiaoshi
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "智慧教室-分页列表查询")
@ApiOperation(value="智慧教室-分页列表查询", notes="智慧教室-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<KcZhihuijiaoshi>> queryPageList(KcZhihuijiaoshi kcZhihuijiaoshi,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<KcZhihuijiaoshi> queryWrapper = QueryGenerator.initQueryWrapper(kcZhihuijiaoshi, req.getParameterMap());
Page<KcZhihuijiaoshi> page = new Page<KcZhihuijiaoshi>(pageNo, pageSize);
IPage<KcZhihuijiaoshi> pageList = kcZhihuijiaoshiService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param kcZhihuijiaoshi
* @return
*/
@AutoLog(value = "智慧教室-添加")
@ApiOperation(value="智慧教室-添加", notes="智慧教室-添加")
@RequiresPermissions("jiaoshi:kc_zhihuijiaoshi:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody KcZhihuijiaoshi kcZhihuijiaoshi) {
kcZhihuijiaoshiService.save(kcZhihuijiaoshi);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param kcZhihuijiaoshi
* @return
*/
@AutoLog(value = "智慧教室-编辑")
@ApiOperation(value="智慧教室-编辑", notes="智慧教室-编辑")
@RequiresPermissions("jiaoshi:kc_zhihuijiaoshi:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody KcZhihuijiaoshi kcZhihuijiaoshi) {
kcZhihuijiaoshiService.updateById(kcZhihuijiaoshi);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "智慧教室-通过id删除")
@ApiOperation(value="智慧教室-通过id删除", notes="智慧教室-通过id删除")
@RequiresPermissions("jiaoshi:kc_zhihuijiaoshi:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
kcZhihuijiaoshiService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "智慧教室-批量删除")
@ApiOperation(value="智慧教室-批量删除", notes="智慧教室-批量删除")
@RequiresPermissions("jiaoshi:kc_zhihuijiaoshi:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.kcZhihuijiaoshiService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "智慧教室-通过id查询")
@ApiOperation(value="智慧教室-通过id查询", notes="智慧教室-通过id查询")
@GetMapping(value = "/queryById")
public Result<KcZhihuijiaoshi> queryById(@RequestParam(name="id",required=true) String id) {
KcZhihuijiaoshi kcZhihuijiaoshi = kcZhihuijiaoshiService.getById(id);
if(kcZhihuijiaoshi==null) {
return Result.error("未找到对应数据");
}
return Result.OK(kcZhihuijiaoshi);
}
/**
* 导出excel
*
* @param request
* @param kcZhihuijiaoshi
*/
@RequiresPermissions("jiaoshi:kc_zhihuijiaoshi:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, KcZhihuijiaoshi kcZhihuijiaoshi) {
return super.exportXls(request, kcZhihuijiaoshi, KcZhihuijiaoshi.class, "智慧教室");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("jiaoshi:kc_zhihuijiaoshi:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, KcZhihuijiaoshi.class);
}
}

95
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcJiaoshixinxibiao.java Normal file
View File

@ -0,0 +1,95 @@
package org.jeecg.modules.kc.jiaoshi.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 教室信息表
* @Author: jeecg-boot
* @Date: 2023-04-19
* @Version: V1.0
*/
@Data
@TableName("kc_jiaoshixinxibiao")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="kc_jiaoshixinxibiao对象", description="教室信息表")
public class KcJiaoshixinxibiao implements Serializable {
private static final long serialVersionUID = 1L;
/**教室编号*/
@Excel(name = "教室编号", width = 15)
@ApiModelProperty(value = "教室编号")
private java.lang.String jsbh;
/**教室名称*/
@Excel(name = "教室名称", width = 15)
@ApiModelProperty(value = "教室名称")
private java.lang.String jsmc;
/**门牌号*/
@Excel(name = "门牌号", width = 15)
@ApiModelProperty(value = "门牌号")
private java.lang.String mph;
/**校区*/
@Excel(name = "校区", width = 15)
@ApiModelProperty(value = "校区")
private java.lang.String xq;
/**教室类型*/
@Excel(name = "教室类型", width = 15)
@ApiModelProperty(value = "教室类型")
private java.lang.String jslx;
/**所属教学楼*/
@Excel(name = "所属教学楼", width = 15)
@ApiModelProperty(value = "所属教学楼")
private java.lang.String ssjxl;
/**所属单位*/
@Excel(name = "所属单位", width = 15)
@ApiModelProperty(value = "所属单位")
private java.lang.String ssdw;
/**排课优先级*/
@Excel(name = "排课优先级", width = 15)
@ApiModelProperty(value = "排课优先级")
private java.lang.String pkyxj;
/**是否专用*/
@Excel(name = "是否专用", width = 15)
@ApiModelProperty(value = "是否专用")
private java.lang.String sfzy;
/**教室类型2*/
@Excel(name = "教室类型2", width = 15)
@ApiModelProperty(value = "教室类型2")
private java.lang.String jslx2;
/**座位数*/
@Excel(name = "座位数", width = 15)
@ApiModelProperty(value = "座位数")
private java.lang.String zws;
/**考试座位数*/
@Excel(name = "考试座位数", width = 15)
@ApiModelProperty(value = "考试座位数")
private java.lang.String kszws;
/**是否可用*/
@Excel(name = "是否可用", width = 15)
@ApiModelProperty(value = "是否可用")
private java.lang.String sfky;
/**是否笔试考试*/
@Excel(name = "是否笔试考试", width = 15)
@ApiModelProperty(value = "是否笔试考试")
private java.lang.String sfbsks;
/**是否可借用*/
@Excel(name = "是否可借用", width = 15)
@ApiModelProperty(value = "是否可借用")
private java.lang.String sfkjy;
}

63
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshi.java Normal file
View File

@ -0,0 +1,63 @@
package org.jeecg.modules.kc.jiaoshi.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 智慧教室
* @Author: jeecg-boot
* @Date: 2023-04-19
* @Version: V1.0
*/
@Data
@TableName("kc_zhihuijiaoshi")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="kc_zhihuijiaoshi对象", description="智慧教室")
public class KcZhihuijiaoshi implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.Integer id;
/**校区*/
@Excel(name = "校区", width = 15)
@ApiModelProperty(value = "校区")
private java.lang.String xq;
/**项目*/
@Excel(name = "项目", width = 15)
@ApiModelProperty(value = "项目")
private java.lang.String xm;
/**新ip*/
@Excel(name = "新ip", width = 15)
@ApiModelProperty(value = "新ip")
private java.lang.String ip;
/**账号*/
@Excel(name = "账号", width = 15)
@ApiModelProperty(value = "账号")
private java.lang.String user;
/**密码*/
@Excel(name = "密码", width = 15)
@ApiModelProperty(value = "密码")
private java.lang.String mima;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private java.lang.String bz;
}

17
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/mapper/KcJiaoshixinxibiaoMapper.java Normal file
View File

@ -0,0 +1,17 @@
package org.jeecg.modules.kc.jiaoshi.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoshixinxibiao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 教室信息表
* @Author: jeecg-boot
* @Date: 2023-04-19
* @Version: V1.0
*/
public interface KcJiaoshixinxibiaoMapper extends BaseMapper<KcJiaoshixinxibiao> {
}

17
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/mapper/KcZhihuijiaoshiMapper.java Normal file
View File

@ -0,0 +1,17 @@
package org.jeecg.modules.kc.jiaoshi.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshi;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 智慧教室
* @Author: jeecg-boot
* @Date: 2023-04-19
* @Version: V1.0
*/
public interface KcZhihuijiaoshiMapper extends BaseMapper<KcZhihuijiaoshi> {
}

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/mapper/xml/KcJiaoshixinxibiaoMapper.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.kc.jiaoshi.mapper.KcJiaoshixinxibiaoMapper">
</mapper>

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/mapper/xml/KcZhihuijiaoshiMapper.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.kc.jiaoshi.mapper.KcZhihuijiaoshiMapper">
</mapper>

14
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/service/IKcJiaoshixinxibiaoService.java Normal file
View File

@ -0,0 +1,14 @@
package org.jeecg.modules.kc.jiaoshi.service;
import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoshixinxibiao;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 教室信息表
* @Author: jeecg-boot
* @Date: 2023-04-19
* @Version: V1.0
*/
public interface IKcJiaoshixinxibiaoService extends IService<KcJiaoshixinxibiao> {
}

14
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/service/IKcZhihuijiaoshiService.java Normal file
View File

@ -0,0 +1,14 @@
package org.jeecg.modules.kc.jiaoshi.service;
import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshi;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 智慧教室
* @Author: jeecg-boot
* @Date: 2023-04-19
* @Version: V1.0
*/
public interface IKcZhihuijiaoshiService extends IService<KcZhihuijiaoshi> {
}

19
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/service/impl/KcJiaoshixinxibiaoServiceImpl.java Normal file
View File

@ -0,0 +1,19 @@
package org.jeecg.modules.kc.jiaoshi.service.impl;
import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoshixinxibiao;
import org.jeecg.modules.kc.jiaoshi.mapper.KcJiaoshixinxibiaoMapper;
import org.jeecg.modules.kc.jiaoshi.service.IKcJiaoshixinxibiaoService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 教室信息表
* @Author: jeecg-boot
* @Date: 2023-04-19
* @Version: V1.0
*/
@Service
public class KcJiaoshixinxibiaoServiceImpl extends ServiceImpl<KcJiaoshixinxibiaoMapper, KcJiaoshixinxibiao> implements IKcJiaoshixinxibiaoService {
}

19
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/service/impl/KcZhihuijiaoshiServiceImpl.java Normal file
View File

@ -0,0 +1,19 @@
package org.jeecg.modules.kc.jiaoshi.service.impl;
import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshi;
import org.jeecg.modules.kc.jiaoshi.mapper.KcZhihuijiaoshiMapper;
import org.jeecg.modules.kc.jiaoshi.service.IKcZhihuijiaoshiService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 智慧教室
* @Author: jeecg-boot
* @Date: 2023-04-19
* @Version: V1.0
*/
@Service
public class KcZhihuijiaoshiServiceImpl extends ServiceImpl<KcZhihuijiaoshiMapper, KcZhihuijiaoshi> implements IKcZhihuijiaoshiService {
}

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

@ -91,6 +91,9 @@ public class KcKechengbiao implements Serializable {
@Dict(dicCode = "kcxz")
@ApiModelProperty(value = "课程性质")
private java.lang.String kcxz;
/**教室编号*/
@Excel(name = "教室编号", width = 15)
private String jsbh;
/**上课地点*/
@Excel(name = "上课地点", width = 15)
@ApiModelProperty(value = "上课地点")