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

修改bug

This commit is contained in:
yangjun 2023-06-09 08:33:06 +08:00
parent 63bb3a1a79
commit 9c6ae5a93e
6 changed files with 171 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
View File

@ -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"); //监听扫码

97
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/JcgkkTask.java Normal file
View File

@ -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<String, Object> param){
//查询数据
Date date = new Date();//获取当前时间
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(Calendar.DAY_OF_MONTH, -1);//当前时间前去一田
QueryWrapper<KcGongkaike> queryWrapper = new QueryWrapper<>();
queryWrapper.le("rq", DateUtil.format(date,"yyyy-MM-dd"));
queryWrapper.lt("jssj", DateUtil.format(date,"HH:mm"));
queryWrapper.ne("dqzt","已下课");
List<KcGongkaike> inDataList = kcGongkaikeService.list(queryWrapper);//查询以前的数据，不是下课中的,修改成下课中
for(KcGongkaike KcGongkaike:inDataList){
KcGongkaike.setDqzt("已下课");
KcGongkaike.setDqztpx("3");
kcGongkaikeService.updateById(KcGongkaike);
}
QueryWrapper<KcGongkaike> 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<KcGongkaike> inDataList2 = kcGongkaikeService.list(queryWrapper2);//查询正在上课的数据
for(KcGongkaike KcGongkaike:inDataList2){
KcGongkaike.setDqzt("上课中");
KcGongkaike.setDqztpx("1");
kcGongkaikeService.updateById(KcGongkaike);
}
}
/**
* 无参定时任务实现
*/
public void run(){
run(null);
}
}

1
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcAssessuser/entity/KcAssessuser.java
View File

@ -73,5 +73,6 @@ public class KcAssessuser implements Serializable {
@TableField(exist = false)
private String zwmc;
@TableField(exist = false)
private List<KcAssessuser> lists;
}

33
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java
View File

@ -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<KcZzThpjb, IKcZzThpjbSe
private IKcEvaluationansService kcEvaluationansService;
@Autowired
private ChangeTingKeTongJi changeTingKeTongJi;
@Autowired
private IKcAssessuserService kcAssessuserService;
/**
* 分页列表查询
@ -203,15 +207,28 @@ public class KcZzThpjbController extends JeecgController<KcZzThpjb, IKcZzThpjbSe
List<KcZzThpjb> list = ExcelImportUtil.importExcel(file.getInputStream(), KcZzThpjb.class, params);
String rest = "";
String errorRest = "";
for(KcZzThpjb KcZzThpjb : list){
if(StringUtils.isBlank(KcZzThpjb.getPkjsbh())){
QueryWrapper<KcAssessuser> 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<KcZzThpjb> newList = list;
int errNum = 0;
for(int i=0;i<list.size();i++){
KcZzThpjb KcZzThpjbPar = list.get(i);
QueryWrapper<KcZzThpjb> 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<KcZzThpjb> listPar = kcZzThpjbService.list(queryWrapper);
@ -221,10 +238,10 @@ public class KcZzThpjbController extends JeecgController<KcZzThpjb, IKcZzThpjbSe
errorRest += "数据重复："+KcZzThpjbPar.getKcbh()+"-"+KcZzThpjbPar.getKcmc()+"-"+KcZzThpjbPar.getSkjs()+"-"+KcZzThpjbPar.getSkdd()+"-"+"<br/>";
}else{
QueryWrapper<KcKetangbiao> 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<KcKetangbiao> kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper);
if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){

46
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java
View File

@ -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<KcZzYbtkb, IKcZzYbtkbSe
private IKcEvaluationansService kcEvaluationansService;
@Autowired
private ChangeTingKeTongJi changeTingKeTongJi;
@Autowired
private IKcAssessuserService kcAssessuserService;
/**
* 分页列表查询
@ -202,18 +208,31 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
List<KcZzYbtkb> list = ExcelImportUtil.importExcel(file.getInputStream(), KcZzYbtkb.class, params);
String rest = "";
String errorRest = "";
for(KcZzYbtkb KcZzYbtkbPar : list){
if(StringUtils.isBlank(KcZzYbtkbPar.getTkjsbh())){
QueryWrapper<KcAssessuser> 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<KcZzYbtkb> newList = list;
int errNum = 0;
for(int i=0;i<list.size();i++){
KcZzYbtkb KcZzYbtkbPar = list.get(i);
QueryWrapper<KcZzYbtkb> 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<KcZzYbtkb> listPar = kcZzYbtkbService.list(queryWrapper);
if(listPar!=null&&listPar.size()>0){
@ -222,9 +241,9 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
errorRest += "已经导入（重复数据）："+KcZzYbtkbPar.getKcmc()+"-"+KcZzYbtkbPar.getSkjs()+"-"+KcZzYbtkbPar.getSkdd()+"-"+KcZzYbtkbPar.getTkjsbh()+"-"+KcZzYbtkbPar.getTkjsxm()+"<br/>";
}else{
QueryWrapper<KcKetangbiao> 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<KcKetangbiao> kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper);
@ -240,7 +259,10 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
String ans8 = KcZzYbtkbPar.getAns8();//30 上课认真听讲、积极思考，主动与老师交流互动
String ans9 = KcZzYbtkbPar.getAns9();//31 课堂教学总体印象评价
String ans10 = KcZzYbtkbPar.getAns10();//32 对课堂内容以及其他方面的具体意见或建议
int upuserid = Integer.parseInt(KcZzYbtkbPar.getTkjsbh());
int upuserid = 0;
if(StringUtils.isNotBlank(KcZzYbtkbPar.getTkjsbh())){
upuserid = Integer.parseInt(KcZzYbtkbPar.getTkjsbh());
}
String upuser = KcZzYbtkbPar.getTkjsxm();
Date tkrq = KcZzYbtkbPar.getPksj();
int evaluationver = 3;
@ -426,10 +448,6 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
kcEvaluationsService.save(kcEvaluations);
}
}else{
errNum++;
newList.remove(KcZzYbtkbPar);

19
jeecg-module-main/src/main/java/org/jeecg/modules/wxgzh/WxgzhController.java
View File

@ -9,6 +9,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.client.RestTemplate;
import java.io.UnsupportedEncodingException;
@ -39,7 +40,7 @@ public class WxgzhController {
private static final String domainTo = "http://www.baidu.com";
//1.先查询code
@RequestMapping("/getCode")
@RequestMapping("/wxpay/getCode")
public String getCode() {
// 官方地址
String urlFir = "redirect:https://open.weixin.qq.com/connect/oauth2/authorize?appid=";
@ -72,25 +73,35 @@ public class WxgzhController {
@GetMapping("/wxpay/weixinoauth")
public void weixinOauth(@RequestParam String code, @RequestParam String state) throws Exception {
log.info("获取code:{}",code);
log.info("获取state:{}",state);
String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid="
+ appId + "&secret=" + appIdSecret + "&code=" + code + "&grant_type=authorization_code";
String res = HttpUtil.get(url);
String openid = JSONObject.parseObject(res).getString("openid");
JSONObject obj = JSONObject.parseObject(res);
log.info("根据code查询得到openId:{}",openid);
log.info("obj:{}",obj);
}
@GetMapping("/getToken")
public void getAccessToken() throws Exception{
@GetMapping("/wxpay/getToken")
public String getAccessToken() throws Exception{
String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+ appId +"&secret=" + appIdSecret;
String res = HttpUtil.get(url);
JSONObject jsonObject = JSONObject.parseObject(res);
String accessToken = jsonObject.getString("access_token");
log.info("accessToken：{}", accessToken);
return accessToken;
}
@RequestMapping("/wxpay/checkToken")
@ResponseBody
public String checkToken(@RequestParam("echostr") String echostr) {
return echostr;
}
@GetMapping("/sendMessage")
@GetMapping("/wxpay/sendMessage")
public String sendMessage() {
// 模板参数
Map<String, WeChatTemplateMsg> sendMag = new HashMap<String, WeChatTemplateMsg>();