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 new file mode 100644 index 00000000..b9db6acc --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java @@ -0,0 +1,185 @@ +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.api.vo.Result; +import org.jeecg.common.util.DateUtils; +import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; +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 SyncKcktStat 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()); + 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("zc",KcKechengbiaoPar.getZc()); + kcKechengbiaoQueryWrapper.eq("rwbh",KcKechengbiaoPar.getRwbh()); + kcKechengbiaoQueryWrapper.eq("kkdwid",KcKechengbiaoPar.getKkdwid()); + kcKechengbiaoQueryWrapper.eq("kcxz",KcKechengbiaoPar.getKcxz()); + kcKechengbiaoQueryWrapper.eq("jsbh",KcKechengbiaoPar.getJsbh()); + 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){ + BeanUtils.copyProperties(KcKechengbiaoPar,KcKechengbiao); + kcKechengbiaoService.updateById(KcKechengbiao); + } + }else{ + kcKechengbiaoService.saveOne(KcKechengbiaoPar); + } + } + //-----------------初始化数据------------------------ + + //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- + 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()); + 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("tzrq",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/kcKetangbiaoSkrqLog/entity/KcKetangbiaoSkrqLog.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/entity/KcKetangbiaoSkrqLog.java new file mode 100644 index 00000000..6bf3e26e --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/entity/KcKetangbiaoSkrqLog.java @@ -0,0 +1,39 @@ +package org.jeecg.modules.kc.kcKetangbiaoSkrqLog.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; + +/** + * @Description: kc_college + * @Author: jeecg-boot + * @Date: 2023-05-19 + * @Version: V1.0 + */ +@Data +@TableName("Kc_Ketangbiao_Skrq_Log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="KcKetangbiaoSkrqLog", description="KcKetangbiaoSkrqLog") +public class KcKetangbiaoSkrqLog implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + + private String skrq; + private String tzrq; + + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/mapper/KcKetangbiaoSkrqLogMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/mapper/KcKetangbiaoSkrqLogMapper.java new file mode 100644 index 00000000..bd7666a7 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/mapper/KcKetangbiaoSkrqLogMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.kcKetangbiaoSkrqLog.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.kc.kcKetangbiaoSkrqLog.entity.KcKetangbiaoSkrqLog; + +/** + * @Description: kc_college + * @Author: jeecg-boot + * @Date: 2023-05-19 + * @Version: V1.0 + */ +public interface KcKetangbiaoSkrqLogMapper extends BaseMapper { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/mapper/xml/KcKetangbiaoSkrqLogMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/mapper/xml/KcKetangbiaoSkrqLogMapper.xml new file mode 100644 index 00000000..9ffdca10 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/mapper/xml/KcKetangbiaoSkrqLogMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/service/IKcKetangbiaoSkrqLogService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/service/IKcKetangbiaoSkrqLogService.java new file mode 100644 index 00000000..4fd12974 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/service/IKcKetangbiaoSkrqLogService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.kcKetangbiaoSkrqLog.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.kc.kcKetangbiaoSkrqLog.entity.KcKetangbiaoSkrqLog; + +/** + * @Description: kc_college + * @Author: jeecg-boot + * @Date: 2023-05-19 + * @Version: V1.0 + */ +public interface IKcKetangbiaoSkrqLogService extends IService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/service/impl/KcKetangbiaoSkrqLogServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/service/impl/KcKetangbiaoSkrqLogServiceImpl.java new file mode 100644 index 00000000..3e45e90d --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/service/impl/KcKetangbiaoSkrqLogServiceImpl.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.kc.kcKetangbiaoSkrqLog.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.kc.kcKetangbiaoSkrqLog.entity.KcKetangbiaoSkrqLog; +import org.jeecg.modules.kc.kcKetangbiaoSkrqLog.mapper.KcKetangbiaoSkrqLogMapper; +import org.jeecg.modules.kc.kcKetangbiaoSkrqLog.service.IKcKetangbiaoSkrqLogService; +import org.springframework.stereotype.Service; + +/** + * @Description: kc_college + * @Author: jeecg-boot + * @Date: 2023-05-19 + * @Version: V1.0 + */ +@Service +public class KcKetangbiaoSkrqLogServiceImpl extends ServiceImpl implements IKcKetangbiaoSkrqLogService { + +} 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 2112f6ef..edca7265 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 @@ -27,4 +27,8 @@ public interface KcKechengbiaoMapper extends BaseMapper { List getSzkcList(); IPage listGroupBy(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List getKechengbiaoList(KcKechengbiao kcKechengbiao); + + void saveOne(KcKechengbiao kcKechengbiaoPar); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java index 06684c44..23db070f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java @@ -58,4 +58,8 @@ public interface KcKetangbiaoMapper extends BaseMapper { IPage indexYkktzsPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); IPage getKtsbMorelist(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + void updateJsbh(); + + void updateSkxs(KcKetangbiao kcKetangbiaoup); } 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 a2c09747..db3e1153 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 @@ -63,4 +63,28 @@ ${ew.customSqlSegment} + + + + insert into kc_kechengbiao ( + kcbh,kcmc,skjs,zc,xkrs,pkrs,rwbh,kkdw,kcxz,skdd,sksj,jkzc,hh,week,hhks,hhjs,dsz, + wwks,wwjs,zbfs,hyh,hymm,kclj,beizhu,zbpx,kkdwid, + jrfs,ewmwj,qmc,qlx,leixing,isqzyz,jkzc1,xf,xq,jgh,xnxq,jzglb,sfcj,skxs,sfzc,bz,zt,kcdl,xqxn + ) values (#{kcbh},#{kcmc},#{skjs},#{zc},#{xkrs},#{pkrs},#{rwbh},#{kkdw},#{kcxz},#{skdd},#{sksj},#{jkzc},#{hh},#{week},#{hhks},#{hhjs},#{dsz}, + #{wwks},#{wwjs},#{zbfs},#{hyh},#{hymm},#{kclj},#{beizhu},#{zbpx},#{kkdwid}, + #{jrfs},#{ewmwj},#{qmc},#{qlx},#{leixing},#{isqzyz},#{jkzc1},#{xf},#{xq},#{jgh},#{xnxq},#{jzglb},#{sfcj},#{skxs},#{sfzc},#{bz},#{zt},#{kcdl},#{xqxn}) + \ 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 4514bb39..64501367 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 @@ -140,6 +140,11 @@ id as kechengbiao1, '' as sfxsk,jgh,bz,zt,jsbh,kcdl from kc_kechengbiao + + + and xqxn = #{xnxq} + + + + update kc_ketangbiao a,(select jsbh,jsmc from kc_zhihuijiaoshi GROUP BY jsbh,jsmc) b + set a.jsbh = b.jsbh + where a.skdd = b.jsmc + + + + update kc_ketangbiao set skxs = #{skxs} where xnxq = #{xnxq} + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java index d1d3baf8..4687daf7 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java @@ -25,4 +25,8 @@ public interface IKcKechengbiaoService extends IService { List getSzkcList(); IPage listGroupBy(Page page, QueryWrapper queryWrapper); + + List getKechengbiaoList(KcKechengbiao kcKechengbiao); + + void saveOne(KcKechengbiao kcKechengbiaoPar); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java index 953576ff..0410d84a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java @@ -60,4 +60,8 @@ public interface IKcKetangbiaoService extends IService { IPage indexYkktzsPage(Page page, QueryWrapper qw3); IPage getKtsbMorelist(Page page, QueryWrapper queryWrapper); + + void updateJsbh(); + + void updateSkxs(KcKetangbiao kcKetangbiaoup); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java index 27bbea12..702ae6e6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java @@ -46,4 +46,14 @@ public class KcKechengbiaoServiceImpl extends ServiceImpl getKechengbiaoList(KcKechengbiao kcKechengbiao) { + return baseMapper.getKechengbiaoList(kcKechengbiao); + } + + @Override + public void saveOne(KcKechengbiao kcKechengbiaoPar) { + baseMapper.saveOne(kcKechengbiaoPar); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java index 29306959..26bda435 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java @@ -121,4 +121,14 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl getKtsbMorelist(Page page, QueryWrapper queryWrapper) { return baseMapper.getKtsbMorelist(page,queryWrapper); } + + @Override + public void updateJsbh() { + baseMapper.updateJsbh(); + } + + @Override + public void updateSkxs(KcKetangbiao kcKetangbiaoup) { + baseMapper.updateSkxs(kcKetangbiaoup); + } }