From fde032f49159f2d64f7c7dab343f7a274a701832 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 26 Mar 2024 18:31:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SynchronizationService/SyncKcktStat.java | 10 + .../SyncKcktStatCopy.java | 211 +++++++++++++++++ .../SynchronizationService/SyncTJwKckb.java | 75 +++++- .../SyncTJwKckbCopy.java | 81 +++++++ .../controller/KcJieciPipeiController.java | 176 ++++++++++++++ .../kc/kcJieciPipei/entity/KcJieciPipei.java | 63 +++++ .../mapper/KcJieciPipeiMapper.java | 17 ++ .../mapper/xml/KcJieciPipeiMapper.xml | 5 + .../service/IKcJieciPipeiService.java | 14 ++ .../service/impl/KcJieciPipeiServiceImpl.java | 19 ++ .../KcKechengExcludeController.java | 176 ++++++++++++++ .../entity/KcKechengExclude.java | 87 +++++++ .../mapper/KcKechengExcludeMapper.java | 17 ++ .../mapper/xml/KcKechengExcludeMapper.xml | 5 + .../service/IKcKechengExcludeService.java | 14 ++ .../impl/KcKechengExcludeServiceImpl.java | 19 ++ .../kc/kcSysConfig/entity/KcSysConfig.java | 4 + .../kc/kcTingkeBmd/entity/KcTingkeBmd.java | 11 + .../kcTingkeBmd/entity/KcTingkeBmdKcxx.java | 4 + .../kc/kcTingkeBmd/vo/KcTingkeBmdPage.java | 11 + .../modules/kc/ktgl/entity/KcKechengbiao.java | 1 + .../kc/ktgl/mapper/KcKechengbiaoMapper.java | 4 + .../ktgl/mapper/xml/KcKechengbiaoMapper.xml | 18 ++ .../kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 4 +- .../ktgl/service/IKcKechengbiaoService.java | 4 + .../impl/KcKechengbiaoServiceImpl.java | 10 + .../tktj/controller/KcTingkeController.java | 1 + .../controller/XxhbkckbOraController.java | 178 ++++++++++++++ .../kc/xxhbkckbOra/entity/XxhbkckbOra.java | 224 ++++++++++++++++++ .../xxhbkckbOra/mapper/XxhbkckbOraMapper.java | 18 ++ .../mapper/xml/XxhbkckbOraMapper.xml | 10 + .../service/IXxhbkckbOraService.java | 29 +++ .../service/impl/XxhbkckbOraServiceImpl.java | 47 ++++ .../src/main/resources/application-dev.yml | 6 +- 34 files changed, 1565 insertions(+), 8 deletions(-) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStatCopy.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckbCopy.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/controller/KcJieciPipeiController.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/entity/KcJieciPipei.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/mapper/KcJieciPipeiMapper.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/mapper/xml/KcJieciPipeiMapper.xml create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/service/IKcJieciPipeiService.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/service/impl/KcJieciPipeiServiceImpl.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/controller/KcKechengExcludeController.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/entity/KcKechengExclude.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/mapper/KcKechengExcludeMapper.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/mapper/xml/KcKechengExcludeMapper.xml create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/service/IKcKechengExcludeService.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/service/impl/KcKechengExcludeServiceImpl.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/xxhbkckbOra/controller/XxhbkckbOraController.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/xxhbkckbOra/entity/XxhbkckbOra.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/xxhbkckbOra/mapper/XxhbkckbOraMapper.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/xxhbkckbOra/mapper/xml/XxhbkckbOraMapper.xml create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/xxhbkckbOra/service/IXxhbkckbOraService.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/xxhbkckbOra/service/impl/XxhbkckbOraServiceImpl.java diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java index aeee1aeb..ccb528a4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java @@ -112,6 +112,16 @@ public class SyncKcktStat extends BaseSync { + //-----------------所有的数据都变成无效 20240321------------ + KcKechengbiao kcbAll = new KcKechengbiao(); + kcbAll.setXnxq(kcSysConfig.getFlag1()); + kcKechengbiaoService.updateAllFlag(kcbAll);//所有的数据都变成无效 + kcKechengbiaoService.updateYxByXxhbkckb(kcbAll);//根据条件变成有效数据 + + //-----------------所有的数据都变成无效 20240321------------ + + + //------------------刨除指定表的数据 20240314新增 修改flag标志位---------------- KcKechengbiao ktbExculde = new KcKechengbiao(); ktbExculde.setXnxq(kcSysConfig.getFlag1()); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStatCopy.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStatCopy.java new file mode 100644 index 00000000..9c2bbba5 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStatCopy.java @@ -0,0 +1,211 @@ +package org.jeecg.modules.kc.grab.SynchronizationService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.util.DateUtils; +import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; +import org.jeecg.modules.kc.kcKetangbiaoSkrqLog.entity.KcKetangbiaoSkrqLog; +import org.jeecg.modules.kc.kcKetangbiaoSkrqLog.service.IKcKetangbiaoSkrqLogService; +import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; +import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; +import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService; +import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao; +import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; +import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoHisService; +import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService; +import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoHisService; +import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService; +import org.quartz.JobExecutionContext; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.*; + +/** + * 更具原始数据表初始化课程表 + */ +@Slf4j +public class SyncKcktStatCopy extends BaseSync { + + @Autowired + private IKcKechengbiaoService kcKechengbiaoService; + + @Autowired + private IKcSysConfigService kcSysConfigService; + + @Autowired + private IKcKechengbiaoHisService kcKechengbiaoHisService; + + @Autowired + private IKcKetangbiaoService kcKetangbiaoService; + + @Autowired + private IKcKetangbiaoHisService kcKetangbiaoHisService; + + @Autowired + private IKcXqxnHistoryService kcXqxnHistoryService; + + @Autowired + private IKcKetangbiaoSkrqLogService kcKetangbiaoSkrqLogService; + + @Override + public void execute(JobExecutionContext jobExecutionContext) { + start(); + run(getParamMap()); + end(); + } + + + /** + * 有参定时任务实现 + * @param param + */ + public void run(Map param){ + try { + + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + Date dateNow = new Date(); + + + //-----------------修改课程表数据------------------------ + KcKechengbiao kcKechengbiao = new KcKechengbiao(); + kcKechengbiao.setXqxn(kcSysConfig.getFlag1()); +// kcKechengbiao.setSkjs("刘婷"); + List kckblist = kcKechengbiaoService.getKechengbiaoList(kcKechengbiao); + for(KcKechengbiao KcKechengbiaoPar:kckblist){ + QueryWrapper kcKechengbiaoQueryWrapper = new QueryWrapper<>(); + kcKechengbiaoQueryWrapper.eq("kcbh",KcKechengbiaoPar.getKcbh()); + kcKechengbiaoQueryWrapper.eq("kcmc",KcKechengbiaoPar.getKcmc()); + kcKechengbiaoQueryWrapper.eq("jgh",KcKechengbiaoPar.getJgh()); + kcKechengbiaoQueryWrapper.eq("skjs",KcKechengbiaoPar.getSkjs()); + kcKechengbiaoQueryWrapper.eq("rwbh",KcKechengbiaoPar.getRwbh()); + kcKechengbiaoQueryWrapper.eq("kkdwid",KcKechengbiaoPar.getKkdwid()); + kcKechengbiaoQueryWrapper.eq("kcxz",KcKechengbiaoPar.getKcxz()); +// kcKechengbiaoQueryWrapper.eq("skdd",KcKechengbiaoPar.getSkdd()); + kcKechengbiaoQueryWrapper.eq("sksj",KcKechengbiaoPar.getSksj()); + kcKechengbiaoQueryWrapper.eq("jkzc",KcKechengbiaoPar.getJkzc()); + kcKechengbiaoQueryWrapper.eq("xf",KcKechengbiaoPar.getXf()); + kcKechengbiaoQueryWrapper.eq("xnxq",KcKechengbiaoPar.getXnxq()); + kcKechengbiaoQueryWrapper.eq("kcdl",KcKechengbiaoPar.getKcdl()); + List KcKechengbiaoInsList = kcKechengbiaoService.list(kcKechengbiaoQueryWrapper); + if(KcKechengbiaoInsList!=null&&KcKechengbiaoInsList.size()>0){ + for(KcKechengbiao KcKechengbiao : KcKechengbiaoInsList){ + String id = KcKechengbiao.getId(); + BeanUtils.copyProperties(KcKechengbiaoPar,KcKechengbiao); + KcKechengbiao.setId(id); + kcKechengbiaoService.updateById(KcKechengbiao); + } + }else{ + kcKechengbiaoService.saveOne(KcKechengbiaoPar); + } + } + //-----------------初始化数据------------------------ + + //------------------去除课程表重复数据 20231024新增----------------- + KcKechengbiao KcKechengbiao = new KcKechengbiao(); + KcKechengbiao.setXqxn(kcSysConfig.getFlag1()); + kcKechengbiaoService.removeCfsj(KcKechengbiao); + //------------------去除课程表重复数据 20231024新增----------------- + + + + //-----------------所有的数据都变成无效 20240321------------ +// KcKechengbiao kcbAll = new KcKechengbiao(); +// kcbAll.setXnxq(kcSysConfig.getFlag1()); +// kcKechengbiaoService.updateAllFlag(kcbAll);//所有的数据都变成无效 +// kcKechengbiaoService.updateYxByXxhbkckb(kcbAll);//根据条件变成有效数据 + + //-----------------所有的数据都变成无效 20240321------------ + + + + //------------------刨除指定表的数据 20240314新增 修改flag标志位---------------- + KcKechengbiao ktbExculde = new KcKechengbiao(); + ktbExculde.setXnxq(kcSysConfig.getFlag1()); + kcKechengbiaoService.updateKechengExculde(ktbExculde); + //------------------刨除指定表的数据 20240314新增 修改flag标志位---------------- + + + + + //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- + QueryWrapper KcKetangbiaoQueryWrapper = new QueryWrapper<>(); + KcKetangbiaoQueryWrapper.eq("xnxq",kcSysConfig.getFlag1()); + KcKetangbiaoQueryWrapper.ge("skrq",DateUtils.formatDate(dateNow,"yyyy-MM-dd")); + kcKetangbiaoService.remove(KcKetangbiaoQueryWrapper); + //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- + + String bxqkssj = kcSysConfig.getBxqkssj(); + //插入数据 + KcKetangbiao kcKetangbiao = new KcKetangbiao(); + kcKetangbiao.setXnxq(kcSysConfig.getFlag1()); + kcKetangbiao.setFlag("0"); + List list = kcKetangbiaoService.selectSyncList(kcKetangbiao); + List arrayList = new ArrayList<>(); + for(int i=0;i=DateUtils.parseDate(dasj,"yyyy-MM-dd").getTime()){ + kcKetangbiaoAddNew.setSkrq(skrq); + kcKetangbiaoAddNew.setDijizhou(djz); + kcKetangbiaoAddNew.setXnxq(kcSysConfig.getFlag1()); + arrayList.add(kcKetangbiaoAddNew); + } + } + }catch (Exception e){ + e.printStackTrace(); + } + } + kcKetangbiaoService.saveBatch(arrayList); + + //修改智慧教室关联的课堂表id-- 清洗智慧教室数据 + kcKetangbiaoService.updateJsbh(); + + //修改智慧教室关联的课堂表id-- 清洗智慧教室数据 + KcKetangbiao kcKetangbiaoup = new KcKetangbiao(); + kcKetangbiaoup.setSkxs(1); + kcKetangbiaoup.setXnxq(kcSysConfig.getFlag1()); + kcKetangbiaoService.updateSkxs(kcKetangbiaoup); + + //修改调停课时间 + String dasj = DateUtils.formatDate(dateNow,"yyyy-MM-dd"); + + QueryWrapper kcKetangbiaoSkrqLogQueryWrapper = new QueryWrapper<>(); + kcKetangbiaoSkrqLogQueryWrapper.ge("jsrq",dasj); + List list1 = kcKetangbiaoSkrqLogService.list(kcKetangbiaoSkrqLogQueryWrapper); + for(KcKetangbiaoSkrqLog KcKetangbiaoSkrqLog:list1){ + UpdateWrapper KcKetangbiaoUpdateWrapper = new UpdateWrapper<>(); + KcKetangbiaoUpdateWrapper.set("skrq",KcKetangbiaoSkrqLog.getTzrq()); + KcKetangbiaoUpdateWrapper.eq("skrq",KcKetangbiaoSkrqLog.getSkrq()); + kcKetangbiaoService.update(KcKetangbiaoUpdateWrapper); + } + }catch (Exception e){ + e.printStackTrace(); + } + } + + /** + * 无参定时任务实现 + */ + public void run(){ + run(null); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckb.java index c1c109c7..74e019b9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckb.java @@ -1,17 +1,27 @@ package org.jeecg.modules.kc.grab.SynchronizationService; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.Lists; +import org.apache.commons.lang3.StringUtils; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwKckb; import org.jeecg.modules.kc.grab.exports.service.ITJwKckbService; import org.jeecg.modules.kc.grab.imports.entity.Xxhbkckb; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.service.IXxhbkckbService; +import org.jeecg.modules.kc.kcJieci.entity.KcJieci; +import org.jeecg.modules.kc.kcJieci.service.IKcJieciService; +import org.jeecg.modules.kc.kcJieciPipei.entity.KcJieciPipei; +import org.jeecg.modules.kc.kcJieciPipei.service.IKcJieciPipeiService; +import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao; +import org.jeecg.modules.kc.xxhbkckbOra.entity.XxhbkckbOra; +import org.jeecg.modules.kc.xxhbkckbOra.service.IXxhbkckbOraService; import org.quartz.JobExecutionContext; import org.springframework.beans.factory.annotation.Autowired; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -23,7 +33,14 @@ public class SyncTJwKckb extends BaseSync { @Autowired private IXxhbkckbService impService; - + + @Autowired + private IXxhbkckbOraService xxhbkckbOraService; + + @Autowired + private IKcJieciPipeiService kcJieciPipeiService; + @Autowired + private IKcJieciService kcJieciService; /** * 若参数变量名修改 QuartzJobController中也需对应修改 */ @@ -43,21 +60,71 @@ public class SyncTJwKckb extends BaseSync { public void run(Map param){ //查询数据 List inDataList = expService.list(); - List outDataList = Lists.newArrayList(); + List outDataList = Lists.newArrayList(); //清洗数据 - inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbkckb.class))); + inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, XxhbkckbOra.class))); + //保存到胃 + try { + xxhbkckbOraService.syncList(outDataList); + }catch (Exception e){ + e.printStackTrace(); + } + + //查询异常的节次数据 + List oraList = xxhbkckbOraService.getSksjList(); + List kcJieciPipeiList = new ArrayList<>(); + for(int i=0;i list = xxhbkckbOraService.list(); + List importDataList = Lists.newArrayList(); + for(XxhbkckbOra par:list){ + String sksjArr = par.getSksj();//获取授课事件结合，例如：7010203040506070809101112 + if(StringUtils.isEmpty(sksjArr)){ + continue; + } + String week = sksjArr.substring(0,1);//获取周几上课，例如：7 + String sksj = sksjArr.substring(1,sksjArr.length());//获取具体的上课节次，例如：010203040506070809101112 + + QueryWrapper kcJieciPipeiQueryWrapper = new QueryWrapper<>(); + kcJieciPipeiQueryWrapper.eq("exp_col",sksj); + kcJieciPipeiQueryWrapper.last("limit 1"); + KcJieciPipei kcJieciPipei = kcJieciPipeiService.getOne(kcJieciPipeiQueryWrapper);//根据当前节次获取对应的正确节次数据 + //组装拆分后的数据，封装到xxhbkckb表中 + if(kcJieciPipei != null && StringUtils.isNotBlank(kcJieciPipei.getNorCol())){ + String norCol[] = StringUtils.split(kcJieciPipei.getNorCol(),"|"); + for(String nor : norCol){ + Xxhbkckb xxhbkckb = new Xxhbkckb(); + BeanUtil.copyProperties(par,xxhbkckb); + xxhbkckb.setId(null); + xxhbkckb.setSksj(week+nor); + importDataList.add(xxhbkckb); + } + } + } //保存到胃 int syncnum=0; String errorMessage = ""; try { - impService.syncList(outDataList); + QueryWrapper dqw = new QueryWrapper(); + impService.remove(dqw); + impService.syncList(importDataList); syncnum = outDataList.size(); }catch (Exception e){ e.printStackTrace(); errorMessage = e.getMessage(); } + Xxhbkckb Xxhbkckb = impService.getSumnum(); int mysqlnum=Xxhbkckb.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckbCopy.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckbCopy.java new file mode 100644 index 00000000..fbde2e66 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckbCopy.java @@ -0,0 +1,81 @@ +package org.jeecg.modules.kc.grab.SynchronizationService; + +import cn.hutool.core.bean.BeanUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.compress.utils.Lists; +import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; +import org.jeecg.modules.kc.grab.exports.entity.TJwKckb; +import org.jeecg.modules.kc.grab.exports.service.ITJwKckbService; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbkckb; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; +import org.jeecg.modules.kc.grab.imports.service.IXxhbkckbService; +import org.quartz.JobExecutionContext; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; +import java.util.Map; + +@Slf4j +public class SyncTJwKckbCopy extends BaseSync { + + @Autowired + private ITJwKckbService expService; + + @Autowired + private IXxhbkckbService impService; + + /** + * 若参数变量名修改 QuartzJobController中也需对应修改 + */ + + @Override + public void execute(JobExecutionContext jobExecutionContext) { + start(); + run(getParamMap()); + end(); + } + + + /** + * 有参定时任务实现 + * @param param + */ + public void run(Map param){ + //查询数据 + List inDataList = expService.list(); + List outDataList = Lists.newArrayList(); + + //清洗数据 + inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbkckb.class))); + + //保存到胃 + int syncnum=0; + String errorMessage = ""; + try { + impService.syncList(outDataList); + syncnum = outDataList.size(); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbkckb Xxhbkckb = impService.getSumnum(); + int mysqlnum=Xxhbkckb.getMysqlnum(); + Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); + xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); + xxhbsynclog.setOratabname("T_JW_KCKB");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 + xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 + xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 + xxhbsynclog.setErrormessage(errorMessage); + saveLog(xxhbsynclog, Xxhbkckb.class); + } + + /** + * 无参定时任务实现 + */ + public void run(){ + run(null); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/controller/KcJieciPipeiController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/controller/KcJieciPipeiController.java new file mode 100644 index 00000000..86d8e579 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/controller/KcJieciPipeiController.java @@ -0,0 +1,176 @@ +package org.jeecg.modules.kc.kcJieciPipei.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.kcJieciPipei.entity.KcJieciPipei; +import org.jeecg.modules.kc.kcJieciPipei.service.IKcJieciPipeiService; + +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: 2024-03-21 + * @Version: V1.0 + */ +@Api(tags="节次匹配数据") +@RestController +@RequestMapping("/kcJieciPipei/kcJieciPipei") +@Slf4j +public class KcJieciPipeiController extends JeecgController { + @Autowired + private IKcJieciPipeiService kcJieciPipeiService; + + /** + * 分页列表查询 + * + * @param kcJieciPipei + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "节次匹配数据-分页列表查询") + @ApiOperation(value="节次匹配数据-分页列表查询", notes="节次匹配数据-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(KcJieciPipei kcJieciPipei, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcJieciPipei, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = kcJieciPipeiService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param kcJieciPipei + * @return + */ + @AutoLog(value = "节次匹配数据-添加") + @ApiOperation(value="节次匹配数据-添加", notes="节次匹配数据-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody KcJieciPipei kcJieciPipei) { + kcJieciPipeiService.save(kcJieciPipei); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param kcJieciPipei + * @return + */ + @AutoLog(value = "节次匹配数据-编辑") + @ApiOperation(value="节次匹配数据-编辑", notes="节次匹配数据-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody KcJieciPipei kcJieciPipei) { + kcJieciPipeiService.updateById(kcJieciPipei); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "节次匹配数据-通过id删除") + @ApiOperation(value="节次匹配数据-通过id删除", notes="节次匹配数据-通过id删除") + @RequiresPermissions("kcJieciPipei:kc_jieci_pipei:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + kcJieciPipeiService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "节次匹配数据-批量删除") + @ApiOperation(value="节次匹配数据-批量删除", notes="节次匹配数据-批量删除") + @RequiresPermissions("kcJieciPipei:kc_jieci_pipei:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.kcJieciPipeiService.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 queryById(@RequestParam(name="id",required=true) String id) { + KcJieciPipei kcJieciPipei = kcJieciPipeiService.getById(id); + if(kcJieciPipei==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(kcJieciPipei); + } + + /** + * 导出excel + * + * @param request + * @param kcJieciPipei + */ + @RequiresPermissions("kcJieciPipei:kc_jieci_pipei:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, KcJieciPipei kcJieciPipei) { + return super.exportXls(request, kcJieciPipei, KcJieciPipei.class, "节次匹配数据"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("kcJieciPipei:kc_jieci_pipei:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, KcJieciPipei.class); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/entity/KcJieciPipei.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/entity/KcJieciPipei.java new file mode 100644 index 00000000..2b0e5d0a --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/entity/KcJieciPipei.java @@ -0,0 +1,63 @@ +package org.jeecg.modules.kc.kcJieciPipei.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: 2024-03-21 + * @Version: V1.0 + */ +@Data +@TableName("kc_jieci_pipei") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="kc_jieci_pipei对象", description="节次匹配数据") +public class KcJieciPipei implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**createBy*/ + @ApiModelProperty(value = "createBy") + private java.lang.String createBy; + /**createTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "createTime") + private java.util.Date createTime; + /**updateBy*/ + @ApiModelProperty(value = "updateBy") + private java.lang.String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "updateTime") + private java.util.Date updateTime; + /**异常数据*/ + @Excel(name = "异常数据", width = 15) + @ApiModelProperty(value = "异常数据") + private java.lang.String expCol; + /**正确数据*/ + @Excel(name = "正确数据", width = 15) + @ApiModelProperty(value = "正确数据") + private java.lang.String norCol; +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/mapper/KcJieciPipeiMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/mapper/KcJieciPipeiMapper.java new file mode 100644 index 00000000..eee0ad6c --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/mapper/KcJieciPipeiMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.kc.kcJieciPipei.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.kc.kcJieciPipei.entity.KcJieciPipei; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 节次匹配数据 + * @Author: jeecg-boot + * @Date: 2024-03-21 + * @Version: V1.0 + */ +public interface KcJieciPipeiMapper extends BaseMapper { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/mapper/xml/KcJieciPipeiMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/mapper/xml/KcJieciPipeiMapper.xml new file mode 100644 index 00000000..bd9b3708 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/mapper/xml/KcJieciPipeiMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/service/IKcJieciPipeiService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/service/IKcJieciPipeiService.java new file mode 100644 index 00000000..3ca3d57f --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/service/IKcJieciPipeiService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.kcJieciPipei.service; + +import org.jeecg.modules.kc.kcJieciPipei.entity.KcJieciPipei; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 节次匹配数据 + * @Author: jeecg-boot + * @Date: 2024-03-21 + * @Version: V1.0 + */ +public interface IKcJieciPipeiService extends IService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/service/impl/KcJieciPipeiServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/service/impl/KcJieciPipeiServiceImpl.java new file mode 100644 index 00000000..a196f475 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieciPipei/service/impl/KcJieciPipeiServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.kc.kcJieciPipei.service.impl; + +import org.jeecg.modules.kc.kcJieciPipei.entity.KcJieciPipei; +import org.jeecg.modules.kc.kcJieciPipei.mapper.KcJieciPipeiMapper; +import org.jeecg.modules.kc.kcJieciPipei.service.IKcJieciPipeiService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 节次匹配数据 + * @Author: jeecg-boot + * @Date: 2024-03-21 + * @Version: V1.0 + */ +@Service +public class KcJieciPipeiServiceImpl extends ServiceImpl implements IKcJieciPipeiService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/controller/KcKechengExcludeController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/controller/KcKechengExcludeController.java new file mode 100644 index 00000000..0a7a0a15 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/controller/KcKechengExcludeController.java @@ -0,0 +1,176 @@ +package org.jeecg.modules.kc.kcKechengExclude.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.kcKechengExclude.entity.KcKechengExclude; +import org.jeecg.modules.kc.kcKechengExclude.service.IKcKechengExcludeService; + +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: 2024-03-21 + * @Version: V1.0 + */ +@Api(tags="课程刨除数据") +@RestController +@RequestMapping("/kcKechengExclude/kcKechengExclude") +@Slf4j +public class KcKechengExcludeController extends JeecgController { + @Autowired + private IKcKechengExcludeService kcKechengExcludeService; + + /** + * 分页列表查询 + * + * @param kcKechengExclude + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "课程刨除数据-分页列表查询") + @ApiOperation(value="课程刨除数据-分页列表查询", notes="课程刨除数据-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(KcKechengExclude kcKechengExclude, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcKechengExclude, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = kcKechengExcludeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param kcKechengExclude + * @return + */ + @AutoLog(value = "课程刨除数据-添加") + @ApiOperation(value="课程刨除数据-添加", notes="课程刨除数据-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody KcKechengExclude kcKechengExclude) { + kcKechengExcludeService.save(kcKechengExclude); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param kcKechengExclude + * @return + */ + @AutoLog(value = "课程刨除数据-编辑") + @ApiOperation(value="课程刨除数据-编辑", notes="课程刨除数据-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody KcKechengExclude kcKechengExclude) { + kcKechengExcludeService.updateById(kcKechengExclude); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "课程刨除数据-通过id删除") + @ApiOperation(value="课程刨除数据-通过id删除", notes="课程刨除数据-通过id删除") + @RequiresPermissions("kcKechengExclude:kc_kecheng_exclude:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + kcKechengExcludeService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "课程刨除数据-批量删除") + @ApiOperation(value="课程刨除数据-批量删除", notes="课程刨除数据-批量删除") + @RequiresPermissions("kcKechengExclude:kc_kecheng_exclude:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.kcKechengExcludeService.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 queryById(@RequestParam(name="id",required=true) String id) { + KcKechengExclude kcKechengExclude = kcKechengExcludeService.getById(id); + if(kcKechengExclude==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(kcKechengExclude); + } + + /** + * 导出excel + * + * @param request + * @param kcKechengExclude + */ + @RequiresPermissions("kcKechengExclude:kc_kecheng_exclude:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, KcKechengExclude kcKechengExclude) { + return super.exportXls(request, kcKechengExclude, KcKechengExclude.class, "课程刨除数据"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("kcKechengExclude:kc_kecheng_exclude:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, KcKechengExclude.class); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/entity/KcKechengExclude.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/entity/KcKechengExclude.java new file mode 100644 index 00000000..06ffe144 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/entity/KcKechengExclude.java @@ -0,0 +1,87 @@ +package org.jeecg.modules.kc.kcKechengExclude.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: 2024-03-21 + * @Version: V1.0 + */ +@Data +@TableName("kc_kecheng_exclude") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="kc_kecheng_exclude对象", description="课程刨除数据") +public class KcKechengExclude implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**课程名称*/ + @Excel(name = "课程名称", width = 15) + @ApiModelProperty(value = "课程名称") + private java.lang.String kcmc; + /**教工号*/ + @Excel(name = "教工号", width = 15) + @ApiModelProperty(value = "教工号") + private java.lang.String jgh; + /**授课教师*/ + @Excel(name = "授课教师", width = 15) + @ApiModelProperty(value = "授课教师") + private java.lang.String skjs; + /**开课单位*/ + @Excel(name = "开课单位", width = 15) + @ApiModelProperty(value = "开课单位") + private java.lang.String kkdw; + /**课程性质*/ + @Excel(name = "课程性质", width = 15) + @ApiModelProperty(value = "课程性质") + private java.lang.String kcxz; + /**上课地点*/ + @Excel(name = "上课地点", width = 15) + @ApiModelProperty(value = "上课地点") + private java.lang.String skdd; + /**授课时间*/ + @Excel(name = "授课时间", width = 15) + @ApiModelProperty(value = "授课时间") + private java.lang.String sksj; + /**授课周次*/ + @Excel(name = "授课周次", width = 15) + @ApiModelProperty(value = "授课周次") + private java.lang.String jkzc; + /**学年学期【orcl】*/ + @Excel(name = "学年学期【orcl】", width = 15) + @ApiModelProperty(value = "学年学期【orcl】") + private java.lang.String xnxq; + /**课程大类*/ + @Excel(name = "课程大类", width = 15) + @ApiModelProperty(value = "课程大类") + private java.lang.String kcdl; + /**是否前台展示*/ + @Excel(name = "是否前台展示", width = 15) + @ApiModelProperty(value = "是否前台展示") + private java.lang.String sfqtzs; + /**学年学期【系统自用】*/ + @Excel(name = "学年学期【系统自用】", width = 15) + @ApiModelProperty(value = "学年学期【系统自用】") + private java.lang.String xqxn; +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/mapper/KcKechengExcludeMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/mapper/KcKechengExcludeMapper.java new file mode 100644 index 00000000..98241959 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/mapper/KcKechengExcludeMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.kc.kcKechengExclude.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.kc.kcKechengExclude.entity.KcKechengExclude; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 课程刨除数据 + * @Author: jeecg-boot + * @Date: 2024-03-21 + * @Version: V1.0 + */ +public interface KcKechengExcludeMapper extends BaseMapper { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/mapper/xml/KcKechengExcludeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/mapper/xml/KcKechengExcludeMapper.xml new file mode 100644 index 00000000..01b2f454 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/mapper/xml/KcKechengExcludeMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/service/IKcKechengExcludeService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/service/IKcKechengExcludeService.java new file mode 100644 index 00000000..20556bf0 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/service/IKcKechengExcludeService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.kcKechengExclude.service; + +import org.jeecg.modules.kc.kcKechengExclude.entity.KcKechengExclude; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 课程刨除数据 + * @Author: jeecg-boot + * @Date: 2024-03-21 + * @Version: V1.0 + */ +public interface IKcKechengExcludeService extends IService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/service/impl/KcKechengExcludeServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/service/impl/KcKechengExcludeServiceImpl.java new file mode 100644 index 00000000..2ed687f4 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKechengExclude/service/impl/KcKechengExcludeServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.kc.kcKechengExclude.service.impl; + +import org.jeecg.modules.kc.kcKechengExclude.entity.KcKechengExclude; +import org.jeecg.modules.kc.kcKechengExclude.mapper.KcKechengExcludeMapper; +import org.jeecg.modules.kc.kcKechengExclude.service.IKcKechengExcludeService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 课程刨除数据 + * @Author: jeecg-boot + * @Date: 2024-03-21 + * @Version: V1.0 + */ +@Service +public class KcKechengExcludeServiceImpl extends ServiceImpl implements IKcKechengExcludeService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/entity/KcSysConfig.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/entity/KcSysConfig.java index 7bb2441a..1d07056b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/entity/KcSysConfig.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/entity/KcSysConfig.java @@ -101,6 +101,10 @@ public class KcSysConfig implements Serializable { @Excel(name = "今日课堂-说明文字", width = 15) @ApiModelProperty(value = "今日课堂-说明文字") private java.lang.String jrktTitle; + /**今日课堂-说明文字*/ + @Excel(name = "白名单-说明文字", width = 15) + @ApiModelProperty(value = "白名单-说明文字") + private java.lang.String bmdTitle; /**智慧教室播放错误提示文字*/ @Excel(name = "智慧教室播放错误提示文字", width = 15) @ApiModelProperty(value = "智慧教室播放错误提示文字") diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/entity/KcTingkeBmd.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/entity/KcTingkeBmd.java index 16ea3636..df2a8894 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/entity/KcTingkeBmd.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/entity/KcTingkeBmd.java @@ -66,4 +66,15 @@ public class KcTingkeBmd implements Serializable { @Excel(name = "学年学期", width = 15) @ApiModelProperty(value = "学年学期") private java.lang.String xnxq; + + /**kssj*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "kssj") + private Date kssj; + /**jssj*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "jssj") + private Date jssj; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/entity/KcTingkeBmdKcxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/entity/KcTingkeBmdKcxx.java index a67e5c6a..ffa6a2ef 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/entity/KcTingkeBmdKcxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/entity/KcTingkeBmdKcxx.java @@ -80,4 +80,8 @@ public class KcTingkeBmdKcxx implements Serializable { @Excel(name = "教工号", width = 15) @ApiModelProperty(value = "教工号") private java.lang.String jgh; + /**开课单位*/ + @Excel(name = "开课单位", width = 15) + @ApiModelProperty(value = "开课单位") + private java.lang.String kkdw; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/vo/KcTingkeBmdPage.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/vo/KcTingkeBmdPage.java index d67307a3..94ce51cd 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/vo/KcTingkeBmdPage.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/vo/KcTingkeBmdPage.java @@ -63,6 +63,17 @@ public class KcTingkeBmdPage { @ApiModelProperty(value = "学年学期") private java.lang.String xnxq; + /**kssj*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "kssj") + private Date kssj; + /**jssj*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "jssj") + private Date jssj; + @ExcelCollection(name="分配的课程") @ApiModelProperty(value = "分配的课程") private List kcTingkeBmdKcxxList; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiao.java index 67a883f2..a36f48f8 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiao.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiao.java @@ -238,6 +238,7 @@ public class KcKechengbiao implements Serializable { private java.lang.String kcdl; private java.lang.String szkc;//思政课程 private String xqxn; + private String flag; /**课程名称或教师名*/ @TableField(exist = false) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java index 10c59ec2..a8ea97db 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java @@ -35,4 +35,8 @@ public interface KcKechengbiaoMapper extends BaseMapper { void removeCfsj(KcKechengbiao kcKechengbiao); void updateKechengExculde(KcKechengbiao ktbExculde); + + void updateAllFlag(KcKechengbiao kcKechengbiao); + + void updateYxByXxhbkckb(KcKechengbiao kcbAll); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml index e2497cab..e05c422a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml @@ -118,4 +118,22 @@ and ifnull(replace(kc.jkzc,',',''),'a')=ifnull(replace(kce.jkzc,',',''),'a') and ifnull(kc.xnxq,'a') = ifnull(kce.xnxq,'a') + + update kc_kechengbiao kc + set kc.flag = '1' + where kc.xqxn = #{xnxq} + + + update xxhbkckb a,kc_kechengbiao b + set b.flag = '0' + where 1=1 + and a.kcbh = b.kcbh + and a.xm = b.skjs + and a.KKDW = b.kkdw + and a.skdd = b.skdd + and a.sksj = b.sksj + and a.XNXQ = b.xnxq + and b.jkzc = substring(a.jkzc,2,length(a.jkzc)-2) + and a.XNXQ = b.xnxq + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml index 920a4842..cb4ec299 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml @@ -35,7 +35,9 @@ + select distinct SUBSTRing(sksj,2,length(sksj)) as sksj from xxhbkckb_ora where SUBSTRing(sksj,2,length(sksj)) not in ( + select distinct exp_col from kc_jieci_pipei + ) + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/xxhbkckbOra/service/IXxhbkckbOraService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/xxhbkckbOra/service/IXxhbkckbOraService.java new file mode 100644 index 00000000..fcfd41bf --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/xxhbkckbOra/service/IXxhbkckbOraService.java @@ -0,0 +1,29 @@ +package org.jeecg.modules.kc.xxhbkckbOra.service; + +import org.jeecg.modules.kc.grab.imports.entity.Xxhbkckb; +import org.jeecg.modules.kc.xxhbkckbOra.entity.XxhbkckbOra; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.Collection; +import java.util.List; + +/** + * @Description: 数据源 + * @Author: jeecg-boot + * @Date: 2024-03-21 + * @Version: V1.0 + */ +public interface IXxhbkckbOraService extends IService { + + boolean syncList(Collection outDataList); + + /** + * + * @param entityList + * @param isDelete + * @return + */ + boolean syncList(Collection entityList, boolean isDelete); + + List getSksjList(); +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/xxhbkckbOra/service/impl/XxhbkckbOraServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/xxhbkckbOra/service/impl/XxhbkckbOraServiceImpl.java new file mode 100644 index 00000000..f7b341d3 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/xxhbkckbOra/service/impl/XxhbkckbOraServiceImpl.java @@ -0,0 +1,47 @@ +package org.jeecg.modules.kc.xxhbkckbOra.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbkckb; +import org.jeecg.modules.kc.xxhbkckbOra.entity.XxhbkckbOra; +import org.jeecg.modules.kc.xxhbkckbOra.mapper.XxhbkckbOraMapper; +import org.jeecg.modules.kc.xxhbkckbOra.service.IXxhbkckbOraService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +/** + * @Description: 数据源 + * @Author: jeecg-boot + * @Date: 2024-03-21 + * @Version: V1.0 + */ +@Service +public class XxhbkckbOraServiceImpl extends ServiceImpl implements IXxhbkckbOraService { + + + @Override + @Transactional(rollbackFor = {Exception.class}) + public boolean syncList(Collection entityList) { + return syncList(entityList, true); + } + + @Override + @Transactional(rollbackFor = {Exception.class}) + public boolean syncList(Collection entityList, boolean isDelete) { + QueryWrapper dqw = new QueryWrapper(); + if(isDelete){ + baseMapper.delete(dqw); + } + return this.saveBatch(entityList, 1000); + } + + @Override + public List getSksjList() { + return baseMapper.getSksjList(); + } + +} diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 40fd0c25..2b729db9 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -139,9 +139,9 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 # multi-oracle: -# url: jdbc:oracle:thin:@//192.168.5.59:1521/ORCL -# username: xskc -# password: xskc +# url: jdbc:oracle:thin:@//192.168.2.185:1521/BLXC +# username: test7788 +# password: test7788 # driver-class-name: oracle.jdbc.OracleDriver #redis 配置 redis: