diff --git a/db/初始化脚本/视图.sql b/db/初始化脚本/视图.sql new file mode 100644 index 00000000..a022703a --- /dev/null +++ b/db/初始化脚本/视图.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root`@`%` SQL SECURITY DEFINER VIEW `course_information_center_jeecg_db`.`kc_jieci_view` AS select `kc_jieci`.`id` AS `id`,concat('',`kc_jieci`.`jieci`,'') AS `jieciname`,`kc_jieci`.`jieci` AS `jieci`,`kc_jieci`.`hhks` AS `hhks`,`kc_jieci`.`hhjs` AS `hhjs` from `kc_jieci` where (length(`kc_jieci`.`jieci`) > 2) ; + +CREATE OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root`@`%` SQL SECURITY DEFINER VIEW `course_information_center_jeecg_db`.`kc_kkdw_view` AS select `kc_kkdw`.`id` AS `id`,`kc_kkdw`.`kkdw` AS `kkdw`,`kc_kkdw`.`dwjc` AS `dwjc`,`kc_kkdw`.`dwbh` AS `dwbh`,`kc_kkdw`.`xsid` AS `xsid`,`kc_kkdw`.`xsmc` AS `xsmc` from `kc_kkdw` order by `kc_kkdw`.`id` ; + +CREATE OR REPLACE ALGORITHM = UNDEFINED DEFINER = `skip-grants user`@`skip-grants host` SQL SECURITY DEFINER VIEW `course_information_center_jeecg_db`.`testevaluation` AS select `evaluations`.`up_date` AS ``,`evaluations`.`up_time` AS `ʱ`,`evaluations`.`upuser` AS ``,`ketangbiao`.`kcmc` AS `γ`,`ketangbiao`.`skjs` AS `ڿνʦ`,`ketangbiao`.`kkdw` AS `ελ`,`ketangbiao`.`skrq` AS `Ͽ`,`evaluationque`.`content` AS ``,concat(ifnull(`evaluationans`.`content`,''),`evaluations`.`textanscontent`) AS ``,`evaluationans`.`score` AS ``,`evaluations`.`evaluationid` AS `evaluationid`,`evaluationque`.`id` AS `id` from (((`evaluations` join `ketangbiao` on((`evaluations`.`ketangbiaoid` = `ketangbiao`.`id`))) join `evaluationque` on((`evaluations`.`queid` = `evaluationque`.`id`))) left join `evaluationans` on((`evaluations`.`ansid` = `evaluationans`.`id`))) where (`evaluationque`.`evaluationver` = 2) order by `evaluations`.`id` desc ; + +CREATE OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root`@`%` SQL SECURITY DEFINER VIEW `course_information_center_jeecg_db`.`tkrszdw_view` AS select distinct `kc_casusers`.`college` AS `college` from `kc_casusers` order by `kc_casusers`.`college` ; + +CREATE OR REPLACE ALGORITHM = UNDEFINED DEFINER = `skip-grants user`@`skip-grants host` SQL SECURITY DEFINER VIEW `course_information_center_jeecg_db`.`xsxkb` AS select group_concat(distinct `kt`.`id` separator ',') AS `ids`,`kt`.`kcmc` AS `kcmc`,`kt`.`skjs` AS `skjs`,`kt`.`zc` AS `zc`,`kt`.`rwbh` AS `rwbh`,`kt`.`kkdw` AS `kkdw`,group_concat(distinct `kt`.`hh` separator ',') AS `hh`,concat(`kt`.`skrq`,' ',min(`kt`.`hhks`)) AS `kssj`,concat(`kt`.`skrq`,' ',max(`kt`.`hhjs`)) AS `jssj`,`kt`.`week` AS `week`,`kt`.`jgh` AS `jgh`,group_concat(concat('"',`xk`.`XH`,'"') separator ',') AS `xh`,`kt`.`skrq` AS `skrq` from (`ketangbiao` `kt` join `xxhbxsxkb` `xk`) where (`kt`.`rwbh` = `xk`.`KCAPZBBH`) group by `kt`.`kcmc`,`kt`.`skjs`,`kt`.`zc`,`kt`.`rwbh`,`kt`.`kkdw`,`kt`.`week`,`kt`.`jgh`,`kt`.`skrq` ; + +CREATE OR REPLACE ALGORITHM = UNDEFINED DEFINER = `skip-grants user`@`skip-grants host` SQL SECURITY DEFINER VIEW `course_information_center_jeecg_db`.`zongtipingjiapingjunfen` AS select `kt`.`kechengbiaoid` AS `kechengbiaoid`,cast(avg(if((`ev`.`evaluationver` = '1'),floor((`ea`.`score` / 2)),`ea`.`score`)) as decimal(10,2)) AS `avgscore` from ((((`evaluation` `ev` join `evaluations` `evs`) join `evaluationque` `eq`) join `evaluationans` `ea`) join `ketangbiao` `kt`) where ((`kt`.`id` = `evs`.`ketangbiaoid`) and (`ev`.`id` = `evs`.`evaluationid`) and (`ev`.`evaluationver` = `eq`.`evaluationver`) and (`ea`.`id` = `evs`.`ansid`) and (`evs`.`queid` = `eq`.`id`) and (`ea`.`queid` = `eq`.`id`) and (`eq`.`genre` = 0)) group by `kt`.`kechengbiaoid` ; + diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKechengbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKechengbiao.java new file mode 100644 index 00000000..a7decf11 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKechengbiao.java @@ -0,0 +1,87 @@ +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.jeecg.common.util.DateUtils; +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.kcSysConfig.entity.KcSysConfig; +import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; +import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao; +import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; +import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService; +import org.quartz.JobExecutionContext; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 更具原始数据表初始化课程表 + */ +@Slf4j +public class SyncKcKechengbiao extends BaseSync { + + @Autowired + private IKcKechengbiaoService kcKechengbiaoService; + + @Autowired + private IKcSysConfigService kcSysConfigService; + + @Override + public void execute(JobExecutionContext jobExecutionContext) { + start(); + run(getParamMap()); + end(); + } + + + /** + * 有参定时任务实现 + * @param param + */ + public void run(Map param){ + + try { + + //更新历史数据 + KcKechengbiao KcKechengbiaohis = new KcKechengbiao(); + KcKechengbiaohis.setTs(DateUtils.formatDate(new Date(),"yyyyMMddHHmmss")); + kcKechengbiaoService.saveHis(KcKechengbiaohis); + //删除当前数据 + QueryWrapper queryWrapper = new QueryWrapper<>(); + kcKechengbiaoService.remove(queryWrapper); + + +// KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + KcKechengbiao kcKechengbiao = new KcKechengbiao(); +// kcKechengbiao.setStartTime(kcSysConfig.getBxqkssj()); +// kcKechengbiao.setEndTime(kcSysConfig.getBxqjssj()); + int syncNum = kcKechengbiaoService.syncKechengbiao(kcKechengbiao); + log.info("数据条数"+syncNum); + Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); + xxhbsynclog.setSyncRowNum(String.valueOf(syncNum)); + saveLog(xxhbsynclog, KcKechengbiao.class); + }catch (Exception e){ + Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); + xxhbsynclog.setSyncRowNum(String.valueOf(-1)); + xxhbsynclog.setErrormessage(e.getMessage()); + saveLog(xxhbsynclog, KcKechengbiao.class); + } + } + + /** + * 无参定时任务实现 + */ + public void run(){ + run(null); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKetangbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKetangbiao.java new file mode 100644 index 00000000..c034f8f9 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKetangbiao.java @@ -0,0 +1,121 @@ +package org.jeecg.modules.kc.grab.SynchronizationService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.grab.imports.entity.Xxhbsynclog; +import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; +import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; +import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao; +import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; +import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService; +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.text.ParseException; +import java.util.*; + +/** + * 更具原始数据表初始化课程表 + */ +@Slf4j +public class SyncKcKetangbiao extends BaseSync { + + + @Autowired + private IKcKetangbiaoService kcKetangbiaoService; + + @Autowired + private IKcSysConfigService kcSysConfigService; + + @Override + public void execute(JobExecutionContext jobExecutionContext) { + start(); + run(getParamMap()); + end(); + } + + + /** + * 有参定时任务实现 + * @param param + */ + public void run(Map param){ + + try { + + //更新历史数据 + KcKetangbiao kcKetangbiaohis = new KcKetangbiao(); + kcKetangbiaohis.setTs(DateUtils.formatDate(new Date(),"yyyyMMddHHmmss")); + kcKetangbiaoService.saveHis(kcKetangbiaohis); + //删除当前数据 + QueryWrapper queryWrapper = new QueryWrapper<>(); + kcKetangbiaoService.remove(queryWrapper); + + + //插入数据 + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + String bxqkssj = kcSysConfig.getBxqkssj(); + KcKetangbiao kcKetangbiao = new KcKetangbiao(); + List list = kcKetangbiaoService.selectSyncList(kcKetangbiao); + List arrayList = new ArrayList<>(); + for(int i=0;i param){ + //查询数据 + Date date = new Date();//获取当前时间 + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.DAY_OF_MONTH, -1);//当前时间前去一田 + QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.like("timestamps", DateUtils.formatDate(calendar.getTime(),"yyyy-MM-dd"));//增量数据 + queryWrapper.apply("trunc(timestamps,'dd') = to_date('"+DateUtils.formatDate(calendar.getTime(),"yyyy-MM-dd")+"','yyyy-mm-dd')"); + List inDataList = tfwdtBkjxtkpjService.list(queryWrapper); + List outDataList = Lists.newArrayList(); + + //清洗数据 + inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbbkjxtkpj.class))); + + //保存到胃 + xxhbbkjxtkpjService.syncList(outDataList); + +// for(Xxhbbkjxtkpj xxhbbkjxtkpj : outDataList){ +// KcEvaluation kcEvaluation = new KcEvaluation(); +// kcEvaluation.setUpDate(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluation.setUpTime(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluation.setUpuser(xxhbbkjxtkpj.getTkrxm()); +// kcEvaluation.setUpuserid(Integer.parseInt(xxhbbkjxtkpj.getTkrgh())); +// kcEvaluation.setUpTimestamp(DateUtils.formatDate(xxhbbkjxtkpj.getTimestamps(),"yyyy-MM-dd HH:mm:ss")); +// kcEvaluation.setEvaluationver(5); +// +// QueryWrapper ktqueryWrapper = new QueryWrapper<>(); +// ktqueryWrapper.eq("kcbh",xxhbbkjxtkpj.getKcbh()); +// List listKt = kcKetangbiaoService.list(ktqueryWrapper); +// KcKetangbiao kcKetangbiao = new KcKetangbiao(); +// if(listKt!=null && listKt.size()>0){ +// kcKetangbiao = listKt.get(0); +// }else{ +// continue; +// } +// +// kcEvaluation.setMinkcid(Integer.parseInt(kcKetangbiao.getId())); +// kcEvaluationService.save(kcEvaluation); +// +// List kcEvaluationsList = new ArrayList<>(); +// +// KcEvaluations kcEvaluations = new KcEvaluations(); +// if(StringUtils.isNotBlank(xxhbbkjxtkpj.getJspg1())){ +// kcEvaluations = new KcEvaluations(); +// kcEvaluations.setUpDate(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpTime(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpuser(xxhbbkjxtkpj.getTkrxm()); +// kcEvaluations.setUpuserid(Integer.parseInt(xxhbbkjxtkpj.getTkrgh())); +// kcEvaluations.setUpTimestamp(DateUtils.formatDate(xxhbbkjxtkpj.getTimestamps(),"yyyy-MM-dd HH:mm:ss")); +// kcEvaluations.setKetangbiaoid(kcEvaluation.getMinkcid()); +// kcEvaluations.setEvaluationid(kcEvaluation.getId()); +// kcEvaluations.setId(null); +// kcEvaluations.setQueid(52); +// if(StringUtils.equals(xxhbbkjxtkpj.getJspg1(),"A")){ +// kcEvaluations.setAnsid(301); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg1(),"B")){ +// kcEvaluations.setAnsid(302); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg1(),"C")){ +// kcEvaluations.setAnsid(303); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg1(),"D")){ +// kcEvaluations.setAnsid(304); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg1(),"E")){ +// kcEvaluations.setAnsid(305); +// } +// kcEvaluations.setTextanscontent(""); +// kcEvaluationsList.add(kcEvaluations); +// } +// +// if(StringUtils.isNotBlank(xxhbbkjxtkpj.getJspg2())){ +// kcEvaluations = new KcEvaluations(); +// kcEvaluations.setUpDate(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpTime(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpuser(xxhbbkjxtkpj.getTkrxm()); +// kcEvaluations.setUpuserid(Integer.parseInt(xxhbbkjxtkpj.getTkrgh())); +// kcEvaluations.setUpTimestamp(DateUtils.formatDate(xxhbbkjxtkpj.getTimestamps(),"yyyy-MM-dd HH:mm:ss")); +// kcEvaluations.setKetangbiaoid(kcEvaluation.getMinkcid()); +// kcEvaluations.setEvaluationid(kcEvaluation.getId()); +// kcEvaluations.setId(null); +// kcEvaluations.setQueid(53); +// if(StringUtils.equals(xxhbbkjxtkpj.getJspg2(),"A")){ +// kcEvaluations.setAnsid(306); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg2(),"B")){ +// kcEvaluations.setAnsid(307); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg2(),"C")){ +// kcEvaluations.setAnsid(308); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg2(),"D")){ +// kcEvaluations.setAnsid(309); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg2(),"E")){ +// kcEvaluations.setAnsid(310); +// } +// kcEvaluations.setTextanscontent(""); +// kcEvaluationsList.add(kcEvaluations); +// } +// +// if(StringUtils.isNotBlank(xxhbbkjxtkpj.getJspg3())){ +// kcEvaluations = new KcEvaluations(); +// kcEvaluations.setUpDate(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpTime(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpuser(xxhbbkjxtkpj.getTkrxm()); +// kcEvaluations.setUpuserid(Integer.parseInt(xxhbbkjxtkpj.getTkrgh())); +// kcEvaluations.setUpTimestamp(DateUtils.formatDate(xxhbbkjxtkpj.getTimestamps(),"yyyy-MM-dd HH:mm:ss")); +// kcEvaluations.setKetangbiaoid(kcEvaluation.getMinkcid()); +// kcEvaluations.setEvaluationid(kcEvaluation.getId()); +// kcEvaluations.setId(null); +// kcEvaluations.setQueid(54); +// if(StringUtils.equals(xxhbbkjxtkpj.getJspg3(),"A")){ +// kcEvaluations.setAnsid(311); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg3(),"B")){ +// kcEvaluations.setAnsid(312); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg3(),"C")){ +// kcEvaluations.setAnsid(313); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg3(),"D")){ +// kcEvaluations.setAnsid(314); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg3(),"E")){ +// kcEvaluations.setAnsid(315); +// } +// kcEvaluations.setTextanscontent(""); +// kcEvaluationsList.add(kcEvaluations); +// } +// +// if(StringUtils.isNotBlank(xxhbbkjxtkpj.getJspg4())){ +// kcEvaluations = new KcEvaluations(); +// kcEvaluations.setUpDate(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpTime(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpuser(xxhbbkjxtkpj.getTkrxm()); +// kcEvaluations.setUpuserid(Integer.parseInt(xxhbbkjxtkpj.getTkrgh())); +// kcEvaluations.setUpTimestamp(DateUtils.formatDate(xxhbbkjxtkpj.getTimestamps(),"yyyy-MM-dd HH:mm:ss")); +// kcEvaluations.setKetangbiaoid(kcEvaluation.getMinkcid()); +// kcEvaluations.setEvaluationid(kcEvaluation.getId()); +// kcEvaluations.setId(null); +// kcEvaluations.setQueid(55); +// if(StringUtils.equals(xxhbbkjxtkpj.getJspg4(),"A")){ +// kcEvaluations.setAnsid(316); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg4(),"B")){ +// kcEvaluations.setAnsid(317); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg4(),"C")){ +// kcEvaluations.setAnsid(318); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg4(),"D")){ +// kcEvaluations.setAnsid(319); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg4(),"E")){ +// kcEvaluations.setAnsid(320); +// } +// kcEvaluations.setTextanscontent(""); +// kcEvaluationsList.add(kcEvaluations); +// } +// +// if(StringUtils.isNotBlank(xxhbbkjxtkpj.getJspg5())){ +// kcEvaluations = new KcEvaluations(); +// kcEvaluations.setUpDate(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpTime(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpuser(xxhbbkjxtkpj.getTkrxm()); +// kcEvaluations.setUpuserid(Integer.parseInt(xxhbbkjxtkpj.getTkrgh())); +// kcEvaluations.setUpTimestamp(DateUtils.formatDate(xxhbbkjxtkpj.getTimestamps(),"yyyy-MM-dd HH:mm:ss")); +// kcEvaluations.setKetangbiaoid(kcEvaluation.getMinkcid()); +// kcEvaluations.setEvaluationid(kcEvaluation.getId()); +// kcEvaluations.setId(null); +// kcEvaluations.setQueid(56); +// if(StringUtils.equals(xxhbbkjxtkpj.getJspg5(),"A")){ +// kcEvaluations.setAnsid(321); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg5(),"B")){ +// kcEvaluations.setAnsid(322); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg5(),"C")){ +// kcEvaluations.setAnsid(323); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg5(),"D")){ +// kcEvaluations.setAnsid(324); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getJspg5(),"E")){ +// kcEvaluations.setAnsid(325); +// } +// kcEvaluations.setTextanscontent(""); +// kcEvaluationsList.add(kcEvaluations); +// } +// +// if(StringUtils.isNotBlank(xxhbbkjxtkpj.getXspg1())){ +// kcEvaluations = new KcEvaluations(); +// kcEvaluations.setUpDate(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpTime(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpuser(xxhbbkjxtkpj.getTkrxm()); +// kcEvaluations.setUpuserid(Integer.parseInt(xxhbbkjxtkpj.getTkrgh())); +// kcEvaluations.setUpTimestamp(DateUtils.formatDate(xxhbbkjxtkpj.getTimestamps(),"yyyy-MM-dd HH:mm:ss")); +// kcEvaluations.setKetangbiaoid(kcEvaluation.getMinkcid()); +// kcEvaluations.setEvaluationid(kcEvaluation.getId()); +// kcEvaluations.setId(null); +// kcEvaluations.setQueid(57); +// if(StringUtils.equals(xxhbbkjxtkpj.getXspg1(),"A")){ +// kcEvaluations.setAnsid(326); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg1(),"B")){ +// kcEvaluations.setAnsid(327); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg1(),"C")){ +// kcEvaluations.setAnsid(328); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg1(),"D")){ +// kcEvaluations.setAnsid(329); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg1(),"E")){ +// kcEvaluations.setAnsid(330); +// } +// kcEvaluations.setTextanscontent(""); +// kcEvaluationsList.add(kcEvaluations); +// } +// +// if(StringUtils.isNotBlank(xxhbbkjxtkpj.getXspg2())){ +// kcEvaluations = new KcEvaluations(); +// kcEvaluations.setUpDate(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpTime(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpuser(xxhbbkjxtkpj.getTkrxm()); +// kcEvaluations.setUpuserid(Integer.parseInt(xxhbbkjxtkpj.getTkrgh())); +// kcEvaluations.setUpTimestamp(DateUtils.formatDate(xxhbbkjxtkpj.getTimestamps(),"yyyy-MM-dd HH:mm:ss")); +// kcEvaluations.setKetangbiaoid(kcEvaluation.getMinkcid()); +// kcEvaluations.setEvaluationid(kcEvaluation.getId()); +// kcEvaluations.setId(null); +// kcEvaluations.setQueid(58); +// if(StringUtils.equals(xxhbbkjxtkpj.getXspg2(),"A")){ +// kcEvaluations.setAnsid(331); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg2(),"B")){ +// kcEvaluations.setAnsid(332); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg2(),"C")){ +// kcEvaluations.setAnsid(333); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg2(),"D")){ +// kcEvaluations.setAnsid(334); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg2(),"E")){ +// kcEvaluations.setAnsid(335); +// } +// kcEvaluations.setTextanscontent(""); +// kcEvaluationsList.add(kcEvaluations); +// } +// +// if(StringUtils.isNotBlank(xxhbbkjxtkpj.getXspg3())){ +// kcEvaluations = new KcEvaluations(); +// kcEvaluations.setUpDate(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpTime(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpuser(xxhbbkjxtkpj.getTkrxm()); +// kcEvaluations.setUpuserid(Integer.parseInt(xxhbbkjxtkpj.getTkrgh())); +// kcEvaluations.setUpTimestamp(DateUtils.formatDate(xxhbbkjxtkpj.getTimestamps(),"yyyy-MM-dd HH:mm:ss")); +// kcEvaluations.setKetangbiaoid(kcEvaluation.getMinkcid()); +// kcEvaluations.setEvaluationid(kcEvaluation.getId()); +// kcEvaluations.setId(null); +// kcEvaluations.setQueid(59); +// if(StringUtils.equals(xxhbbkjxtkpj.getXspg3(),"A")){ +// kcEvaluations.setAnsid(336); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg3(),"B")){ +// kcEvaluations.setAnsid(337); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg3(),"C")){ +// kcEvaluations.setAnsid(338); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg3(),"D")){ +// kcEvaluations.setAnsid(339); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg3(),"E")){ +// kcEvaluations.setAnsid(340); +// } +// kcEvaluations.setTextanscontent(""); +// kcEvaluationsList.add(kcEvaluations); +// } +// +// +// if(StringUtils.isNotBlank(xxhbbkjxtkpj.getXspg3())){ +// kcEvaluations = new KcEvaluations(); +// kcEvaluations.setUpDate(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpTime(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpuser(xxhbbkjxtkpj.getTkrxm()); +// kcEvaluations.setUpuserid(Integer.parseInt(xxhbbkjxtkpj.getTkrgh())); +// kcEvaluations.setUpTimestamp(DateUtils.formatDate(xxhbbkjxtkpj.getTimestamps(),"yyyy-MM-dd HH:mm:ss")); +// kcEvaluations.setKetangbiaoid(kcEvaluation.getMinkcid()); +// kcEvaluations.setEvaluationid(kcEvaluation.getId()); +// kcEvaluations.setId(null); +// kcEvaluations.setQueid(60); +// if(StringUtils.equals(xxhbbkjxtkpj.getXspg3(),"A")){ +// kcEvaluations.setAnsid(341); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg3(),"B")){ +// kcEvaluations.setAnsid(342); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg3(),"C")){ +// kcEvaluations.setAnsid(343); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg3(),"D")){ +// kcEvaluations.setAnsid(344); +// }else if(StringUtils.equals(xxhbbkjxtkpj.getXspg3(),"E")){ +// kcEvaluations.setAnsid(345); +// } +// kcEvaluations.setTextanscontent(""); +// kcEvaluationsList.add(kcEvaluations); +// } +// +// if(StringUtils.isNotBlank(xxhbbkjxtkpj.getQtyj())){ +// kcEvaluations = new KcEvaluations(); +// kcEvaluations.setUpDate(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpTime(xxhbbkjxtkpj.getTimestamps()); +// kcEvaluations.setUpuser(xxhbbkjxtkpj.getTkrxm()); +// kcEvaluations.setUpuserid(Integer.parseInt(xxhbbkjxtkpj.getTkrgh())); +// kcEvaluations.setUpTimestamp(DateUtils.formatDate(xxhbbkjxtkpj.getTimestamps(),"yyyy-MM-dd HH:mm:ss")); +// kcEvaluations.setKetangbiaoid(kcEvaluation.getMinkcid()); +// kcEvaluations.setEvaluationid(kcEvaluation.getId()); +// kcEvaluations.setId(null); +// kcEvaluations.setQueid(61); +// kcEvaluations.setAnsid(0); +// kcEvaluations.setTextanscontent(xxhbbkjxtkpj.getQtyj()); +// kcEvaluationsList.add(kcEvaluations); +// } +// +// kcEvaluationsService.saveBatch(kcEvaluationsList); +// +// +// +// } + + Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); + xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); + saveLog(xxhbsynclog,Xxhbbkjxtkpj.class); + } + + /** + * 无参定时任务实现 + */ + public void run(){ + run(null); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/controller/TFwdtBkjxtkpjController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/controller/TFwdtBkjxtkpjController.java new file mode 100644 index 00000000..af0f9d37 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/controller/TFwdtBkjxtkpjController.java @@ -0,0 +1,162 @@ +package org.jeecg.modules.kc.grab.exports.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.kc.grab.exports.entity.TFwdtBkjxtkpj; +import org.jeecg.modules.kc.grab.exports.service.ITFwdtBkjxtkpjService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + +/** +* @Description: TFwdtBkjxtkpj +* @Author: jeecg-boot +* @Date: 2023-05-04 +* @Version: V1.0 +*/ +@Api(tags="TFwdtBkjxtkpj") +@RestController +@RequestMapping("/TFwdtBkjxtkpj/TFwdtBkjxtkpj") +@Slf4j +public class TFwdtBkjxtkpjController extends JeecgController { + @Autowired + private ITFwdtBkjxtkpjService TFwdtBkjxtkpjService; + + /** + * 分页列表查询 + * + * @param TFwdtBkjxtkpj + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "TFwdtBkjxtkpj-分页列表查询") + @ApiOperation(value="TFwdtBkjxtkpj-分页列表查询", notes="TFwdtBkjxtkpj-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(TFwdtBkjxtkpj TFwdtBkjxtkpj, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(TFwdtBkjxtkpj, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = TFwdtBkjxtkpjService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param TFwdtBkjxtkpj + * @return + */ + @AutoLog(value = "TFwdtBkjxtkpj-添加") + @ApiOperation(value="TFwdtBkjxtkpj-添加", notes="TFwdtBkjxtkpj-添加") + @RequiresPermissions("TFwdtBkjxtkpj:TFwdtBkjxtkpj:add") + @PostMapping(value = "/add") + public Result add(@RequestBody TFwdtBkjxtkpj TFwdtBkjxtkpj) { + TFwdtBkjxtkpjService.save(TFwdtBkjxtkpj); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param TFwdtBkjxtkpj + * @return + */ + @AutoLog(value = "TFwdtBkjxtkpj-编辑") + @ApiOperation(value="TFwdtBkjxtkpj-编辑", notes="TFwdtBkjxtkpj-编辑") + @RequiresPermissions("TFwdtBkjxtkpj:TFwdtBkjxtkpj:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody TFwdtBkjxtkpj TFwdtBkjxtkpj) { + TFwdtBkjxtkpjService.updateById(TFwdtBkjxtkpj); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "TFwdtBkjxtkpj-通过id删除") + @ApiOperation(value="TFwdtBkjxtkpj-通过id删除", notes="TFwdtBkjxtkpj-通过id删除") + @RequiresPermissions("TFwdtBkjxtkpj:TFwdtBkjxtkpj:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + TFwdtBkjxtkpjService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "TFwdtBkjxtkpj-批量删除") + @ApiOperation(value="TFwdtBkjxtkpj-批量删除", notes="TFwdtBkjxtkpj-批量删除") + @RequiresPermissions("TFwdtBkjxtkpj:TFwdtBkjxtkpj:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.TFwdtBkjxtkpjService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "TFwdtBkjxtkpj-通过id查询") + @ApiOperation(value="TFwdtBkjxtkpj-通过id查询", notes="TFwdtBkjxtkpj-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + TFwdtBkjxtkpj TFwdtBkjxtkpj = TFwdtBkjxtkpjService.getById(id); + if(TFwdtBkjxtkpj==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(TFwdtBkjxtkpj); + } + + /** + * 导出excel + * + * @param request + * @param TFwdtBkjxtkpj + */ + @RequiresPermissions("TFwdtBkjxtkpj:TFwdtBkjxtkpj:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, TFwdtBkjxtkpj TFwdtBkjxtkpj) { + return super.exportXls(request, TFwdtBkjxtkpj, TFwdtBkjxtkpj.class, "TFwdtBkjxtkpj"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("TFwdtBkjxtkpj:TFwdtBkjxtkpj:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, TFwdtBkjxtkpj.class); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtBkjxtkpj.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtBkjxtkpj.java new file mode 100644 index 00000000..ceccb949 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtBkjxtkpj.java @@ -0,0 +1,132 @@ +package org.jeecg.modules.kc.grab.exports.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +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 org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: xxhbbkjxtkpj + * @Author: jeecg-boot + * @Date: 2023-05-04 + * @Version: V1.0 + */ +@Data +@TableName("T_FWDT_BKJXTKPJ") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="T_FWDT_BKJXTKPJ对象", description="T_FWDT_BKJXTKPJ") +public class TFwdtBkjxtkpj implements Serializable { + private static final long serialVersionUID = 1L; + + /**编号*/ + @Excel(name = "编号", width = 15) + @ApiModelProperty(value = "编号") + private String bh; + /**轮次编号*/ + @Excel(name = "轮次编号", width = 15) + @ApiModelProperty(value = "轮次编号") + private String lcbh; + /**轮次出镜人*/ + @Excel(name = "轮次出镜人", width = 15) + @ApiModelProperty(value = "轮次出镜人") + private String lccjr; + /**听课人工号*/ + @Excel(name = "听课人工号", width = 15) + @ApiModelProperty(value = "听课人工号") + private String tkrgh; + /**听课人姓名*/ + @Excel(name = "听课人姓名", width = 15) + @ApiModelProperty(value = "听课人姓名") + private String tkrxm; + /**听课人单位名称*/ + @Excel(name = "听课人单位名称", width = 15) + @ApiModelProperty(value = "听课人单位名称") + private String tkrdwmc; + /**tksjxq*/ + @Excel(name = "tksjxq", width = 15) + @ApiModelProperty(value = "tksjxq") + private String tksjxq; + /**课程节次*/ + @Excel(name = "课程节次", width = 15) + @ApiModelProperty(value = "课程节次") + private String kcjc; + /**课程单位*/ + @Excel(name = "课程单位", width = 15) + @ApiModelProperty(value = "课程单位") + private String kcdm; + /**听课教师*/ + @Excel(name = "听课教师", width = 15) + @ApiModelProperty(value = "听课教师") + private String tkjs; + /**听课课程名称*/ + @Excel(name = "听课课程名称", width = 15) + @ApiModelProperty(value = "听课课程名称") + private String tkkcmc; + /**任课教师*/ + @Excel(name = "任课教师", width = 15) + @ApiModelProperty(value = "任课教师") + private String rkjs; + /**总体评价*/ + @Excel(name = "总体评价", width = 15) + @ApiModelProperty(value = "总体评价") + private String ztpj; + /**教师工号*/ + @Excel(name = "教师工号", width = 15) + @ApiModelProperty(value = "教师工号") + private String jsgh; + /**全体意见*/ + @Excel(name = "全体意见", width = 15) + @ApiModelProperty(value = "全体意见") + private String qtyj; + /**jspg1*/ + @Excel(name = "jspg1", width = 15) + @ApiModelProperty(value = "jspg1") + private String jspg1; + /**jspg2*/ + @Excel(name = "jspg2", width = 15) + @ApiModelProperty(value = "jspg2") + private String jspg2; + /**jspg3*/ + @Excel(name = "jspg3", width = 15) + @ApiModelProperty(value = "jspg3") + private String jspg3; + /**jspg4*/ + @Excel(name = "jspg4", width = 15) + @ApiModelProperty(value = "jspg4") + private String jspg4; + /**jspg5*/ + @Excel(name = "jspg5", width = 15) + @ApiModelProperty(value = "jspg5") + private String jspg5; + /**xspg1*/ + @Excel(name = "xspg1", width = 15) + @ApiModelProperty(value = "xspg1") + private String xspg1; + /**xspg2*/ + @Excel(name = "xspg2", width = 15) + @ApiModelProperty(value = "xspg2") + private String xspg2; + /**xspg3*/ + @Excel(name = "xspg3", width = 15) + @ApiModelProperty(value = "xspg3") + private String xspg3; + /**课程编号*/ + @Excel(name = "课程编号", width = 15) + @ApiModelProperty(value = "课程编号") + private String kcbh; + /**时间戳*/ + @Excel(name = "时间戳", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "时间戳") + private Date timestamps; +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/mapper/TFwdtBkjxtkpjMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/mapper/TFwdtBkjxtkpjMapper.java new file mode 100644 index 00000000..30e3df38 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/mapper/TFwdtBkjxtkpjMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.grab.exports.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.kc.grab.exports.entity.TFwdtBkjxtkpj; + +/** + * @Description: xxhbbkjxtkpj + * @Author: jeecg-boot + * @Date: 2023-05-04 + * @Version: V1.0 + */ +public interface TFwdtBkjxtkpjMapper extends BaseMapper { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/mapper/xml/TFwdtBkjxtkpjMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/mapper/xml/TFwdtBkjxtkpjMapper.xml new file mode 100644 index 00000000..c049a0ad --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/mapper/xml/TFwdtBkjxtkpjMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/ITFwdtBkjxtkpjService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/ITFwdtBkjxtkpjService.java new file mode 100644 index 00000000..603c15ae --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/ITFwdtBkjxtkpjService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.grab.exports.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.kc.grab.exports.entity.TFwdtBkjxtkpj; + +/** + * @Description: xxhbbkjxtkpj + * @Author: jeecg-boot + * @Date: 2023-05-04 + * @Version: V1.0 + */ +public interface ITFwdtBkjxtkpjService extends IService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/impl/TFwdtBkjxtkpjServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/impl/TFwdtBkjxtkpjServiceImpl.java new file mode 100644 index 00000000..a4c93569 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/impl/TFwdtBkjxtkpjServiceImpl.java @@ -0,0 +1,23 @@ +package org.jeecg.modules.kc.grab.exports.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.kc.grab.exports.entity.TFwdtBkjxtkpj; +import org.jeecg.modules.kc.grab.exports.mapper.TFwdtBkjxtkpjMapper; +import org.jeecg.modules.kc.grab.exports.service.ITFwdtBkjxtkpjService; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbbkjxtkpj; +import org.jeecg.modules.kc.grab.imports.mapper.XxhbbkjxtkpjMapper; +import org.jeecg.modules.kc.grab.imports.service.IXxhbbkjxtkpjService; +import org.springframework.stereotype.Service; + +/** + * @Description: xxhbbkjxtkpj + * @Author: jeecg-boot + * @Date: 2023-05-04 + * @Version: V1.0 + */ +@DS("multi-oracle") +@Service +public class TFwdtBkjxtkpjServiceImpl extends ServiceImpl implements ITFwdtBkjxtkpjService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbbkjxtkpjController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbbkjxtkpjController.java new file mode 100644 index 00000000..cc35958e --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbbkjxtkpjController.java @@ -0,0 +1,162 @@ +package org.jeecg.modules.kc.grab.imports.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbbkjxtkpj; +import org.jeecg.modules.kc.grab.imports.service.IXxhbbkjxtkpjService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: xxhbbkjxtkpj + * @Author: jeecg-boot + * @Date: 2023-05-04 + * @Version: V1.0 + */ +@Api(tags="xxhbbkjxtkpj") +@RestController +@RequestMapping("/xxhbbkjxtkpj/xxhbbkjxtkpj") +@Slf4j +public class XxhbbkjxtkpjController extends JeecgController { + @Autowired + private IXxhbbkjxtkpjService xxhbbkjxtkpjService; + + /** + * 分页列表查询 + * + * @param xxhbbkjxtkpj + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "xxhbbkjxtkpj-分页列表查询") + @ApiOperation(value="xxhbbkjxtkpj-分页列表查询", notes="xxhbbkjxtkpj-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(Xxhbbkjxtkpj xxhbbkjxtkpj, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(xxhbbkjxtkpj, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = xxhbbkjxtkpjService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param xxhbbkjxtkpj + * @return + */ + @AutoLog(value = "xxhbbkjxtkpj-添加") + @ApiOperation(value="xxhbbkjxtkpj-添加", notes="xxhbbkjxtkpj-添加") + @RequiresPermissions("xxhbbkjxtkpj:xxhbbkjxtkpj:add") + @PostMapping(value = "/add") + public Result add(@RequestBody Xxhbbkjxtkpj xxhbbkjxtkpj) { + xxhbbkjxtkpjService.save(xxhbbkjxtkpj); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param xxhbbkjxtkpj + * @return + */ + @AutoLog(value = "xxhbbkjxtkpj-编辑") + @ApiOperation(value="xxhbbkjxtkpj-编辑", notes="xxhbbkjxtkpj-编辑") + @RequiresPermissions("xxhbbkjxtkpj:xxhbbkjxtkpj:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody Xxhbbkjxtkpj xxhbbkjxtkpj) { + xxhbbkjxtkpjService.updateById(xxhbbkjxtkpj); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "xxhbbkjxtkpj-通过id删除") + @ApiOperation(value="xxhbbkjxtkpj-通过id删除", notes="xxhbbkjxtkpj-通过id删除") + @RequiresPermissions("xxhbbkjxtkpj:xxhbbkjxtkpj:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + xxhbbkjxtkpjService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "xxhbbkjxtkpj-批量删除") + @ApiOperation(value="xxhbbkjxtkpj-批量删除", notes="xxhbbkjxtkpj-批量删除") + @RequiresPermissions("xxhbbkjxtkpj:xxhbbkjxtkpj:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.xxhbbkjxtkpjService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "xxhbbkjxtkpj-通过id查询") + @ApiOperation(value="xxhbbkjxtkpj-通过id查询", notes="xxhbbkjxtkpj-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + Xxhbbkjxtkpj xxhbbkjxtkpj = xxhbbkjxtkpjService.getById(id); + if(xxhbbkjxtkpj==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(xxhbbkjxtkpj); + } + + /** + * 导出excel + * + * @param request + * @param xxhbbkjxtkpj + */ + @RequiresPermissions("xxhbbkjxtkpj:xxhbbkjxtkpj:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, Xxhbbkjxtkpj xxhbbkjxtkpj) { + return super.exportXls(request, xxhbbkjxtkpj, Xxhbbkjxtkpj.class, "xxhbbkjxtkpj"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("xxhbbkjxtkpj:xxhbbkjxtkpj:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, Xxhbbkjxtkpj.class); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbkjxtkpj.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbkjxtkpj.java new file mode 100644 index 00000000..f0e36fe9 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbkjxtkpj.java @@ -0,0 +1,137 @@ +package org.jeecg.modules.kc.grab.imports.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: xxhbbkjxtkpj + * @Author: jeecg-boot + * @Date: 2023-05-04 + * @Version: V1.0 + */ +@Data +@TableName("xxhbbkjxtkpj") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="xxhbbkjxtkpj对象", description="xxhbbkjxtkpj") +public class Xxhbbkjxtkpj implements Serializable { + private static final long serialVersionUID = 1L; + + /**编号*/ + @Excel(name = "编号", width = 15) + @ApiModelProperty(value = "编号") + private java.lang.String bh; + /**轮次编号*/ + @Excel(name = "轮次编号", width = 15) + @ApiModelProperty(value = "轮次编号") + private java.lang.String lcbh; + /**轮次出镜人*/ + @Excel(name = "轮次出镜人", width = 15) + @ApiModelProperty(value = "轮次出镜人") + private java.lang.String lccjr; + /**听课人工号*/ + @Excel(name = "听课人工号", width = 15) + @ApiModelProperty(value = "听课人工号") + private java.lang.String tkrgh; + /**听课人姓名*/ + @Excel(name = "听课人姓名", width = 15) + @ApiModelProperty(value = "听课人姓名") + private java.lang.String tkrxm; + /**听课人单位名称*/ + @Excel(name = "听课人单位名称", width = 15) + @ApiModelProperty(value = "听课人单位名称") + private java.lang.String tkrdwmc; + /**tksjxq*/ + @Excel(name = "tksjxq", width = 15) + @ApiModelProperty(value = "tksjxq") + private java.lang.String tksjxq; + /**课程节次*/ + @Excel(name = "课程节次", width = 15) + @ApiModelProperty(value = "课程节次") + private java.lang.String kcjc; + /**课程单位*/ + @Excel(name = "课程单位", width = 15) + @ApiModelProperty(value = "课程单位") + private java.lang.String kcdm; + /**听课教师*/ + @Excel(name = "听课教师", width = 15) + @ApiModelProperty(value = "听课教师") + private java.lang.String tkjs; + /**听课课程名称*/ + @Excel(name = "听课课程名称", width = 15) + @ApiModelProperty(value = "听课课程名称") + private java.lang.String tkkcmc; + /**任课教师*/ + @Excel(name = "任课教师", width = 15) + @ApiModelProperty(value = "任课教师") + private java.lang.String rkjs; + /**总体评价*/ + @Excel(name = "总体评价", width = 15) + @ApiModelProperty(value = "总体评价") + private java.lang.String ztpj; + /**教师工号*/ + @Excel(name = "教师工号", width = 15) + @ApiModelProperty(value = "教师工号") + private java.lang.String jsgh; + /**全体意见*/ + @Excel(name = "全体意见", width = 15) + @ApiModelProperty(value = "全体意见") + private java.lang.String qtyj; + /**jspg1*/ + @Excel(name = "jspg1", width = 15) + @ApiModelProperty(value = "jspg1") + private java.lang.String jspg1; + /**jspg2*/ + @Excel(name = "jspg2", width = 15) + @ApiModelProperty(value = "jspg2") + private java.lang.String jspg2; + /**jspg3*/ + @Excel(name = "jspg3", width = 15) + @ApiModelProperty(value = "jspg3") + private java.lang.String jspg3; + /**jspg4*/ + @Excel(name = "jspg4", width = 15) + @ApiModelProperty(value = "jspg4") + private java.lang.String jspg4; + /**jspg5*/ + @Excel(name = "jspg5", width = 15) + @ApiModelProperty(value = "jspg5") + private java.lang.String jspg5; + /**xspg1*/ + @Excel(name = "xspg1", width = 15) + @ApiModelProperty(value = "xspg1") + private java.lang.String xspg1; + /**xspg2*/ + @Excel(name = "xspg2", width = 15) + @ApiModelProperty(value = "xspg2") + private java.lang.String xspg2; + /**xspg3*/ + @Excel(name = "xspg3", width = 15) + @ApiModelProperty(value = "xspg3") + private java.lang.String xspg3; + /**课程编号*/ + @Excel(name = "课程编号", width = 15) + @ApiModelProperty(value = "课程编号") + private java.lang.String kcbh; + /**时间戳*/ + @Excel(name = "时间戳", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "时间戳") + private java.util.Date timestamps; +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbkjxtkpjMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbkjxtkpjMapper.java new file mode 100644 index 00000000..fc1e3003 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbkjxtkpjMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.kc.grab.imports.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbbkjxtkpj; + +/** + * @Description: xxhbbkjxtkpj + * @Author: jeecg-boot + * @Date: 2023-05-04 + * @Version: V1.0 + */ +public interface XxhbbkjxtkpjMapper extends BaseMapper { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbkjxtkpjMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbkjxtkpjMapper.xml new file mode 100644 index 00000000..c049a0ad --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbkjxtkpjMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbkjxtkpjService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbkjxtkpjService.java new file mode 100644 index 00000000..02806109 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbkjxtkpjService.java @@ -0,0 +1,22 @@ +package org.jeecg.modules.kc.grab.imports.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbbkjxtkpj; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +/** + * @Description: xxhbbkjxtkpj + * @Author: jeecg-boot + * @Date: 2023-05-04 + * @Version: V1.0 + */ +public interface IXxhbbkjxtkpjService extends IService { + + boolean syncList(List outDataList); + + @Transactional(rollbackFor = {Exception.class}) + boolean syncList(Collection entityList, boolean isDelete); +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbkjxtkpjServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbkjxtkpjServiceImpl.java new file mode 100644 index 00000000..e1d488e8 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbkjxtkpjServiceImpl.java @@ -0,0 +1,38 @@ +package org.jeecg.modules.kc.grab.imports.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbbkjxtkpj; +import org.jeecg.modules.kc.grab.imports.mapper.XxhbbkjxtkpjMapper; +import org.jeecg.modules.kc.grab.imports.service.IXxhbbkjxtkpjService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +/** + * @Description: xxhbbkjxtkpj + * @Author: jeecg-boot + * @Date: 2023-05-04 + * @Version: V1.0 + */ +@Service +public class XxhbbkjxtkpjServiceImpl extends ServiceImpl implements IXxhbbkjxtkpjService { + + @Override + @Transactional(rollbackFor = {Exception.class}) + public boolean syncList(List 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); + } +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml index 73b5fc7b..29aa5d07 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml @@ -409,7 +409,8 @@ SELECT tingketime, tkrq, shijian, hq, mq, tk.kcmc, tk.ketangbiaoid, tk.skjs, tk.kkdw, tk.userid, tk.hh, tk.WEEK, - ev.evaluationid, ev.evaluationver, ev.score, suibi.id as suibiId ,suibi.notes as suibiNotes + ev.evaluationid, ev.evaluationver, ev.score, suibi.id as suibiId ,suibi.notes as suibiNotes , + tk.skdd, tk.skrq, tkpj.bh FROM ( SELECT @@ -418,7 +419,7 @@ DATE_FORMAT( tk.tingketime, '%H:%i:%s' ) AS shijian, TIMESTAMPDIFF( HOUR, tk.tingketime, NOW() ) AS hq, TIMESTAMPDIFF( MINUTE, tk.tingketime, NOW() ) AS mq, - kt.kcmc, kt.id AS ketangbiaoid, kt.skjs, kt.kkdw, tk.userid, kt.hh, kt.WEEK + kt.kcmc, kt.id AS ketangbiaoid, kt.skjs, kt.kkdw, tk.userid, kt.hh, kt.WEEK, kt.skdd, kt.skrq FROM kc_tingke tk, kc_ketangbiao kt @@ -467,6 +468,9 @@ ORDER BY create_time DESC ) a GROUP BY user_id, ketangbiao_id ) suibi on suibi.ketangbiao_id = tk.ketangbiaoid + LEFT JOIN xxhbbkjxtkpj tkpj on tk.kcmc = tkpj.tkkcmc and tk.skdd = tkpj.tkjs + and tk.skrq = replace(replace(substring(tkpj.tksjxq,instr(tkpj.tksjxq,'(')+1,10),'年','-'),'月','-') + and tk.skjs = tkpj.rkjs