From 9c6ae5a93e8391f1b63011d7846fd98f7a0dbd30 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 9 Jun 2023 08:33:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/config/shiro/ShiroConfig.java | 1 + .../SynchronizationService/JcgkkTask.java | 97 +++++++++++++++++++ .../kc/kcAssessuser/entity/KcAssessuser.java | 1 + .../controller/KcZzThpjbController.java | 33 +++++-- .../controller/KcZzYbtkbController.java | 46 ++++++--- .../jeecg/modules/wxgzh/WxgzhController.java | 19 +++- 6 files changed, 171 insertions(+), 26 deletions(-) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/JcgkkTask.java diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 534e47f2..9dc18424 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -94,6 +94,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/sys/common/static/**", "anon");//图片预览 &下载文件不限制token filterChainDefinitionMap.put("/sys/common/pdf/**", "anon");//pdf预览 filterChainDefinitionMap.put("/generic/**", "anon");//pdf预览需要文件 + filterChainDefinitionMap.put("/wxpay/**", "anon");//微信接口 filterChainDefinitionMap.put("/sys/getLoginQrcode/**", "anon"); //登录二维码 filterChainDefinitionMap.put("/sys/getQrcodeToken/**", "anon"); //监听扫码 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/JcgkkTask.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/JcgkkTask.java new file mode 100644 index 00000000..862886b9 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/JcgkkTask.java @@ -0,0 +1,97 @@ +package org.jeecg.modules.kc.grab.SynchronizationService; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +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.TFwdtBkjxtkpj; +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.entity.Xxhbsynclog; +import org.jeecg.modules.kc.grab.imports.service.IXxhbbkjxtkpjService; +import org.jeecg.modules.kc.kcGongkaike.entity.KcGongkaike; +import org.jeecg.modules.kc.kcGongkaike.service.IKcGongkaikeService; +import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService; +import org.jeecg.modules.kc.qa.service.IKcEvaluationService; +import org.jeecg.modules.kc.qa.service.IKcEvaluationsService; +import org.jeecg.modules.quartz.entity.QuartzJob; +import org.jeecg.modules.quartz.service.IQuartzJobService; +import org.quartz.JobExecutionContext; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 服务大厅-本科教学服务评价 + */ +@Slf4j +public class JcgkkTask extends BaseSync { + + @Autowired + private IKcGongkaikeService kcGongkaikeService; + + /** + * 若参数变量名修改 QuartzJobController中也需对应修改 + */ + + @Override + public void execute(JobExecutionContext jobExecutionContext) { + start(); + run(getParamMap()); + end(); + } + + + /** + * 有参定时任务实现 + * @param param + */ + public void run(Map param){ + + + //查询数据 + Date date = new Date();//获取当前时间 + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.DAY_OF_MONTH, -1);//当前时间前去一田 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.le("rq", DateUtil.format(date,"yyyy-MM-dd")); + queryWrapper.lt("jssj", DateUtil.format(date,"HH:mm")); + queryWrapper.ne("dqzt","已下课"); + List inDataList = kcGongkaikeService.list(queryWrapper);//查询以前的数据,不是下课中的,修改成下课中 + for(KcGongkaike KcGongkaike:inDataList){ + KcGongkaike.setDqzt("已下课"); + KcGongkaike.setDqztpx("3"); + kcGongkaikeService.updateById(KcGongkaike); + } + + + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.eq("rq", DateUtil.format(date,"yyyy-MM-dd")); + queryWrapper2.ge("kssj", DateUtil.format(date,"HH:mm")); + queryWrapper2.le("jssj", DateUtil.format(date,"HH:mm")); + queryWrapper2.ne("dqzt","已下课"); + List inDataList2 = kcGongkaikeService.list(queryWrapper2);//查询正在上课的数据 + + for(KcGongkaike KcGongkaike:inDataList2){ + KcGongkaike.setDqzt("上课中"); + KcGongkaike.setDqztpx("1"); + kcGongkaikeService.updateById(KcGongkaike); + } + + } + + /** + * 无参定时任务实现 + */ + public void run(){ + run(null); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcAssessuser/entity/KcAssessuser.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcAssessuser/entity/KcAssessuser.java index 90ff474f..e125b0fe 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcAssessuser/entity/KcAssessuser.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcAssessuser/entity/KcAssessuser.java @@ -73,5 +73,6 @@ public class KcAssessuser implements Serializable { @TableField(exist = false) private String zwmc; + @TableField(exist = false) private List lists; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java index be49b600..29a02637 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java @@ -17,6 +17,8 @@ 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.grab.SynchronizationService.tools.ChangeTingKeTongJi; +import org.jeecg.modules.kc.kcAssessuser.entity.KcAssessuser; +import org.jeecg.modules.kc.kcAssessuser.service.IKcAssessuserService; import org.jeecg.modules.kc.kcZzThpjb.entity.KcZzThpjb; import org.jeecg.modules.kc.kcZzThpjb.service.IKcZzThpjbService; @@ -74,6 +76,8 @@ public class KcZzThpjbController extends JeecgController list = ExcelImportUtil.importExcel(file.getInputStream(), KcZzThpjb.class, params); String rest = ""; String errorRest = ""; + for(KcZzThpjb KcZzThpjb : list){ + if(StringUtils.isBlank(KcZzThpjb.getPkjsbh())){ + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + String upuser = KcZzThpjb.getPkjsxm(); + queryWrapper1.eq("username",upuser); + queryWrapper1.last("limit 1"); + KcAssessuser KcCasusers = kcAssessuserService.getOne(queryWrapper1); + if(KcCasusers!=null){ + KcZzThpjb.setPkjsbh(KcCasusers.getUsercode()+""); + } + } + + } List newList = list; int errNum = 0; for(int i=0;i queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("kcbh",KcZzThpjbPar.getKcbh()); - queryWrapper.eq("kcmc",KcZzThpjbPar.getKcmc()); - queryWrapper.eq("skjs",KcZzThpjbPar.getSkjs()); - queryWrapper.eq("skdd",KcZzThpjbPar.getSkdd()); + queryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getKcbh()),"kcbh",KcZzThpjbPar.getKcbh()); + queryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getKcmc()),"kcmc",KcZzThpjbPar.getKcmc()); + queryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getSkjs()),"skjs",KcZzThpjbPar.getSkjs()); + queryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getSkdd()),"skdd",KcZzThpjbPar.getSkdd()); queryWrapper.eq("sksj",KcZzThpjbPar.getSksj()); queryWrapper.eq("pjsj",KcZzThpjbPar.getPjsj()); List listPar = kcZzThpjbService.list(queryWrapper); @@ -221,10 +238,10 @@ public class KcZzThpjbController extends JeecgController"; }else{ QueryWrapper kcKetangbiaoQueryWrapper = new QueryWrapper<>(); - kcKetangbiaoQueryWrapper.eq("kcbh",KcZzThpjbPar.getKcbh()); - kcKetangbiaoQueryWrapper.eq("kcmc",KcZzThpjbPar.getKcmc()); - kcKetangbiaoQueryWrapper.eq("skjs",KcZzThpjbPar.getSkjs()); - kcKetangbiaoQueryWrapper.eq("skdd",KcZzThpjbPar.getSkdd()); + kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getKcbh()),"kcbh",KcZzThpjbPar.getKcbh()); + kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getKcmc()),"kcmc",KcZzThpjbPar.getKcmc()); + kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getSkjs()),"skjs",KcZzThpjbPar.getSkjs()); + kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getSkdd()),"skdd",KcZzThpjbPar.getSkdd()); kcKetangbiaoQueryWrapper.like("skrq", DateUtil.format(KcZzThpjbPar.getSksj(),"yyyy-MM-dd")); List kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper); if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){ diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java index d4993c0f..a3e92f6a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java @@ -17,6 +17,10 @@ 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.grab.SynchronizationService.tools.ChangeTingKeTongJi; +import org.jeecg.modules.kc.kcAssessuser.entity.KcAssessuser; +import org.jeecg.modules.kc.kcAssessuser.service.IKcAssessuserService; +import org.jeecg.modules.kc.kcCasusers.entity.KcCasusers; +import org.jeecg.modules.kc.kcCasusers.service.IKcCasusersService; import org.jeecg.modules.kc.kcZzYbtkb.entity.KcZzYbtkb; import org.jeecg.modules.kc.kcZzYbtkb.service.IKcZzYbtkbService; @@ -73,6 +77,8 @@ public class KcZzYbtkbController extends JeecgController list = ExcelImportUtil.importExcel(file.getInputStream(), KcZzYbtkb.class, params); String rest = ""; String errorRest = ""; + for(KcZzYbtkb KcZzYbtkbPar : list){ + if(StringUtils.isBlank(KcZzYbtkbPar.getTkjsbh())){ + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + String upuser = KcZzYbtkbPar.getTkjsxm(); + queryWrapper1.eq("username",upuser); + queryWrapper1.last("limit 1"); + KcAssessuser KcCasusers = kcAssessuserService.getOne(queryWrapper1); + if(KcCasusers!=null){ + KcZzYbtkbPar.setTkjsbh(KcCasusers.getUsercode()+""); + } + } + + } List newList = list; int errNum = 0; for(int i=0;i queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("kcbh",KcZzYbtkbPar.getKcbh()); - queryWrapper.eq("kcmc",KcZzYbtkbPar.getKcmc()); - queryWrapper.eq("skjs",KcZzYbtkbPar.getSkjs()); - queryWrapper.eq("skdd",KcZzYbtkbPar.getSkdd()); + queryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getKcbh()),"kcbh",KcZzYbtkbPar.getKcbh()); + queryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getKcmc()),"kcmc",KcZzYbtkbPar.getKcmc()); + queryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getSkjs()),"skjs",KcZzYbtkbPar.getSkjs()); + queryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getSkdd()),"skdd",KcZzYbtkbPar.getSkdd()); queryWrapper.eq("skrq",KcZzYbtkbPar.getSkrq()); - queryWrapper.eq("tkjsbh",KcZzYbtkbPar.getTkjsbh()); - queryWrapper.eq("tkjsxm",KcZzYbtkbPar.getTkjsxm()); + queryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getTkjsbh()),"tkjsbh",KcZzYbtkbPar.getTkjsbh()); + queryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getTkjsxm()),"tkjsxm",KcZzYbtkbPar.getTkjsxm()); queryWrapper.like("pksj",DateUtil.format(KcZzYbtkbPar.getPksj(),"yyyy-MM-dd")); List listPar = kcZzYbtkbService.list(queryWrapper); if(listPar!=null&&listPar.size()>0){ @@ -222,9 +241,9 @@ public class KcZzYbtkbController extends JeecgController"; }else{ QueryWrapper kcKetangbiaoQueryWrapper = new QueryWrapper<>(); - kcKetangbiaoQueryWrapper.eq("kcbh",KcZzYbtkbPar.getKcbh()); - kcKetangbiaoQueryWrapper.eq("kcmc",KcZzYbtkbPar.getKcmc()); - kcKetangbiaoQueryWrapper.eq("skdd",KcZzYbtkbPar.getSkdd()); + kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getKcbh()),"kcbh",KcZzYbtkbPar.getKcbh()); + kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getKcmc()),"kcmc",KcZzYbtkbPar.getKcmc()); + kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getSkdd()),"skdd",KcZzYbtkbPar.getSkdd()); kcKetangbiaoQueryWrapper.like("skrq",DateUtil.format(KcZzYbtkbPar.getSkrq(),"yyyy-MM-dd")); kcKetangbiaoQueryWrapper.eq("skjs",KcZzYbtkbPar.getSkjs()); List kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper); @@ -240,7 +259,10 @@ public class KcZzYbtkbController extends JeecgController sendMag = new HashMap();