From 44fb5faceed0a62d6fb5541a9448d3270c7d937e Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 6 Jan 2025 08:54:53 +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 --- .../grab/SynchronizationService/SyncGjtz.java | 53 +++ .../kc/wjxWjxx/service/IWjxWjxxService.java | 2 + .../service/impl/WjxWjxxServiceImpl.java | 212 +++++++++--- .../zyInfo/controller/ZyInfoController.java | 2 +- .../controller/ZyInfoStudentController.java | 15 +- .../zyInfoStudent/entity/ZyInfoStudent.java | 12 +- .../entity/ZyInfoStudentExport.java | 227 ++++++++++++ .../mapper/xml/ZyInfoStudentMapper.xml | 3 +- .../service/IZyInfoStudentService.java | 2 + .../impl/ZyInfoStudentServiceImpl.java | 276 ++++++++++++--- .../modules/tools/dbsdkfzpt/DesUtil.java | 173 ++++++++++ .../modules/tools/dbsdkfzpt/HttpUtil.java | 313 +++++++++++++++++ .../tools/dbsdkfzpt/InterfaceDemo.java | 306 +++++++++++++++++ .../tools/dbsdkfzpt/RestTemplateUtils.java | 325 ++++++++++++++++++ .../tools/dbsdkfzpt/TransformUtils.java | 72 ++++ .../system/controller/CommonController.java | 16 + 16 files changed, 1898 insertions(+), 111 deletions(-) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncGjtz.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudentExport.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/tools/dbsdkfzpt/DesUtil.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/tools/dbsdkfzpt/HttpUtil.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/tools/dbsdkfzpt/InterfaceDemo.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/tools/dbsdkfzpt/RestTemplateUtils.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/tools/dbsdkfzpt/TransformUtils.java diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncGjtz.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncGjtz.java new file mode 100644 index 00000000..a2ac2db7 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncGjtz.java @@ -0,0 +1,53 @@ +package org.jeecg.modules.kc.grab.SynchronizationService; + +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.compress.utils.Lists; +import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; +import org.jeecg.modules.kc.grab.exports.entity.TBks; +import org.jeecg.modules.kc.grab.exports.service.ITBksService; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; +import org.jeecg.modules.kc.grab.imports.service.IXxhbbksService; +import org.jeecg.modules.kc.zyInfoStudent.service.IZyInfoStudentService; +import org.quartz.JobExecutionContext; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; +import java.util.Map; + +@Slf4j +public class SyncGjtz extends BaseSync { + + @Autowired + private IZyInfoStudentService zyInfoStudentService; + + /** + * 若参数变量名修改 QuartzJobController中也需对应修改 + */ + + @Override + public void execute(JobExecutionContext jobExecutionContext) { + start(); + run(getParamMap()); + end(); + } + + + /** + * 有参定时任务实现 + * @param param + */ + public void run(Map param){ + zyInfoStudentService.getWpcccs();//获取维普剩余查重次数 + } + + /** + * 无参定时任务实现 + */ + public void run(){ + run(null); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java index 929d1ac3..13d60dcf 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java @@ -42,4 +42,6 @@ public interface IWjxWjxxService extends IService { Page listOther(WjxWjxx wjxWjxx, Page objectPage); void batchZyinfoKhcl(String id); + + String getAccessToken(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java index cda2ac16..7829e349 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java @@ -16,6 +16,8 @@ import org.jeecg.common.util.SftpConfig; import org.jeecg.common.util.text.StringUtils; import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; import org.jeecg.modules.kc.grab.imports.service.IXxhbbksService; +import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; +import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.jeecg.modules.kc.kcWechatSendLog.entity.KcWechatSendLog; import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao; import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService; @@ -38,9 +40,10 @@ import org.jeecg.modules.kc.zyInfo.entity.ZyInfo; import org.jeecg.modules.kc.zyInfoScjl.entity.ZyInfoScjl; import org.jeecg.modules.kc.zyInfoScjl.service.IZyInfoScjlService; import org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent; +import org.jeecg.modules.tools.dbsdkfzpt.RestTemplateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.ResponseEntity; +import org.springframework.http.*; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.web.client.RestTemplate; @@ -80,6 +83,8 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl private IKcKechengbiaoService kcKechengbiaoService; @Autowired private IZyInfoScjlService zyInfoScjlService; + @Autowired + private IKcSysConfigService kcSysConfigService; @Autowired @@ -553,72 +558,183 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl @Override public void batchZyinfoKhcl(String ids) { try { - String idsList[] = ids.split(","); - if(idsList.length>0){ + String token = getAccessToken();//获取东北师大开放平台token + System.out.println("======================================="); + System.out.println("token:"+token); + System.out.println("======================================="); + if(StringUtils.isNotEmpty(token)){//判断如果token不为空则继续操作 - String yyyy = DateUtils.formatDate(new Date(),"yyyy"); - String mm = DateUtils.formatDate(new Date(),"MM"); - for(String zyId:idsList){ - WjxWjxx wjxWjxx = baseMapper.selectById(zyId); + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + String idsList[] = ids.split(","); + if(idsList.length>0){ + String yyyy = DateUtils.formatDate(new Date(),"yyyy"); + String mm = DateUtils.formatDate(new Date(),"MM"); + for(String zyId:idsList){ - QueryWrapper kcKechengbiaoQueryWrapper = new QueryWrapper<>(); - kcKechengbiaoQueryWrapper.eq("rwbh",wjxWjxx.getRwbh()); - kcKechengbiaoQueryWrapper.eq("jgh",wjxWjxx.getCreateBy()); - kcKechengbiaoQueryWrapper.eq("xqxn",wjxWjxx.getXqxn()); - kcKechengbiaoQueryWrapper.last("limit 1"); - KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("vid",wjxWjxx.getVid()); - queryWrapper.eq("sfsckhcl","0"); - List list = wjxDjxxMapper.selectList(queryWrapper); - for(WjxDjxx wjxDjxx:list){ + WjxWjxx wjxWjxx = baseMapper.selectById(zyId); + //判断没有上传考核材料的数据，才进行上传，否则不上传 + if(wjxWjxx!=null && !StringUtils.equals("1",wjxWjxx.getSfsckhcl())){ + QueryWrapper kcKechengbiaoQueryWrapper = new QueryWrapper<>(); + kcKechengbiaoQueryWrapper.eq("xqxn",kcSysConfig.getFlag1()); + kcKechengbiaoQueryWrapper.eq("rwbh",wjxWjxx.getRwbh()); + kcKechengbiaoQueryWrapper.eq("jgh",wjxWjxx.getCreateBy()); + kcKechengbiaoQueryWrapper.last("limit 1"); + KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); - List djxxTmxxList = wjxDjxxMapper.getDjxxTmxxWjt(wjxDjxx.getJid()); - if(djxxTmxxList!=null){ - for(WjxDjxxTmxx djxxTmxx:djxxTmxxList){ - //上传作业文件 - Map uploadMap = SFTPUtil.upload(sftpConfig,upLoadPath+"/"+djxxTmxx.getAnswerText(),yyyy+"/"+mm+"/"+wjxWjxx.getVid()+"/"+djxxTmxx.getAnswerText().replace("temp/","/")); - if(org.apache.commons.lang3.StringUtils.equals(uploadMap.get("code"),"0")){ - djxxTmxx.setFwqPath(uploadMap.get("data")); - wjxDjxxMapper.updateDjxxTmxxFwqpath(djxxTmxx); + //调用师大接口将数据上传 + String interfaceUrl = "https://intf.nenu.edu.cn/api/bd-api/post/JW_FXCJXMB"; + List> paramsList =new ArrayList<>(); + Map paramMap = new HashMap<>(); + paramMap.put("CJR",wjxWjxx.getCreateBy());//创建人 + paramMap.put("TEABH",wjxWjxx.getCreateBy());//教工号 + paramMap.put("FXCJMC","课程测验"+wjxWjxx.getSort());//分项成绩名称 + paramMap.put("TEADM",wjxWjxx.getCreateBy());//教工代码 + paramMap.put("TEAXM",kcKechengbiao.getSkjs());//教师姓名 + paramMap.put("FXCJBH",wjxWjxx.getId());//分项成绩编号 + paramMap.put("XNXQMC",kcKechengbiao.getXnxq());//学年学期 + paramMap.put("ZYYQ",null);//作业要求 + paramMap.put("CJSJ",DateUtils.formatDate(wjxWjxx.getCreateTime(),"yyyy-MM-dd"));//创建时间 + paramMap.put("FXCJBL",wjxWjxx.getScore());//比例，成绩占比 + paramMap.put("FXCJLXMC","3");//分项成绩类型 + paramMap.put("KCMC",kcKechengbiao.getKcmc());//课程名称 + paramMap.put("KCRWDM",wjxWjxx.getRwbh());//开课任务编号 + paramMap.put("PFBZ",null);//评分标准 + paramMap.put("FXCJDM",wjxWjxx.getId());//主键 +// paramMap.put("OPERATE_STATUS","i");//操作状态 + paramsList.add(paramMap); + String data = RestTemplateUtils.post(interfaceUrl,token, paramsList, MediaType.APPLICATION_JSON_UTF8, String.class); + System.out.println("======================================="); + System.out.println("data:"+data); + System.out.println("======================================="); + + + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("vid",wjxWjxx.getVid()); + queryWrapper.eq("sfsckhcl","0"); + List list = wjxDjxxMapper.selectList(queryWrapper); + + List> paramsList2 =new ArrayList<>(); + for(WjxDjxx wjxDjxx:list){ + + + List djxxTmxxList = wjxDjxxMapper.getDjxxTmxxWjt(wjxDjxx.getJid()); + if(djxxTmxxList!=null){ + for(WjxDjxxTmxx djxxTmxx:djxxTmxxList){ + //上传作业文件 + Map uploadMap = SFTPUtil.upload(sftpConfig,upLoadPath+"/"+djxxTmxx.getAnswerText(),yyyy+"/"+mm+"/"+wjxWjxx.getVid()+"/"+djxxTmxx.getAnswerText().replace("temp/","/")); + if(org.apache.commons.lang3.StringUtils.equals(uploadMap.get("code"),"0")){ + djxxTmxx.setFwqPath(uploadMap.get("data")); + wjxDjxxMapper.updateDjxxTmxxFwqpath(djxxTmxx); + } + } } + wjxDjxx.setSfsckhcl("1"); + wjxDjxx.setSfsckhclTime(new Date()); + wjxDjxxMapper.updateById(wjxDjxx); + + ZyInfoScjl zyInfoScjl = new ZyInfoScjl(); + zyInfoScjl.setZyId(wjxDjxx.getId()); + zyInfoScjl.setZyName(wjxDjxx.getTitle()); + zyInfoScjl.setZyLeixing(wjxDjxx.getAtype()); + zyInfoScjl.setJgh(wjxWjxx.getCreateBy()); + zyInfoScjl.setSkjs(kcKechengbiao.getSkjs()); + zyInfoScjl.setSkdd(kcKechengbiao.getSkdd()); + zyInfoScjl.setKkdw(kcKechengbiao.getKkdw()); + zyInfoScjl.setKkdwid(kcKechengbiao.getKkdwid()); + zyInfoScjl.setKcxz(kcKechengbiao.getKcxz()); + zyInfoScjl.setXnxq(wjxWjxx.getXqxn()); + zyInfoScjl.setStudentNo(wjxDjxx.getCreateBy()); + zyInfoScjl.setStudentName(wjxDjxx.getUserName()); + zyInfoScjlService.save(zyInfoScjl); + + Map paramMap2 = new HashMap<>(); + paramMap2.put("CJ",wjxDjxx.getScore()+"");//成绩 + paramMap2.put("CJR",wjxDjxx.getCreateBy());//创建人 + paramMap2.put("CJSJ",DateUtils.formatDate(wjxDjxx.getCreateTime(),"yyyy-MM-dd"));//创建时间 + paramMap2.put("KCRWDM",wjxWjxx.getRwbh());//开课任务编号 + paramMap2.put("KCMC",kcKechengbiao.getKcmc());//课程名称 + paramMap2.put("FXCJMC","课程测验"+wjxWjxx.getSort());//分项成绩名称 + paramMap2.put("TEAXM",kcKechengbiao.getSkjs());//教师姓名 + paramMap2.put("XSXM",wjxDjxx.getUserName());//学生姓名 + paramMap2.put("KID",wjxDjxx.getId());//主键 + paramMap2.put("XSBH",wjxDjxx.getCreateBy());//学号 + paramMap2.put("FXCJBH",wjxWjxx.getId());//分项成绩编号 + paramMap2.put("PATH","");//附件路径 + paramMap2.put("TEABH",wjxWjxx.getCreateBy());//教工号 +// paramMap2.put("OPERATE_STATUS","i");//操作状态 + paramsList2.add(paramMap2); + } + + System.out.println("======================================="); + System.out.println("paramsList2:"+paramsList2); + System.out.println("======================================="); + //调用师大接口进行上传 + String interfaceUrl2 = "https://intf.nenu.edu.cn/api/bd-api/post/JW_FXXSCJMX"; + String data2 = RestTemplateUtils.post(interfaceUrl2,token, paramsList2, MediaType.APPLICATION_JSON_UTF8, String.class); + System.out.println("======================================="); + System.out.println("data2:"+data2); + System.out.println("======================================="); + + wjxWjxx.setSfsckhcl("1"); + wjxWjxx.setSfsckhclTime(new Date()); + baseMapper.updateById(wjxWjxx); } - wjxDjxx.setSfsckhcl("1"); - wjxDjxx.setSfsckhclTime(new Date()); - wjxDjxxMapper.updateById(wjxDjxx); - ZyInfoScjl zyInfoScjl = new ZyInfoScjl(); - zyInfoScjl.setZyId(wjxDjxx.getId()); - zyInfoScjl.setZyName(wjxDjxx.getTitle()); - zyInfoScjl.setZyLeixing(wjxDjxx.getAtype()); - zyInfoScjl.setJgh(wjxWjxx.getCreateBy()); - zyInfoScjl.setSkjs(kcKechengbiao.getSkjs()); - zyInfoScjl.setSkdd(kcKechengbiao.getSkdd()); - zyInfoScjl.setKkdw(kcKechengbiao.getKkdw()); - zyInfoScjl.setKkdwid(kcKechengbiao.getKkdwid()); - zyInfoScjl.setKcxz(kcKechengbiao.getKcxz()); - zyInfoScjl.setXnxq(wjxWjxx.getXqxn()); - zyInfoScjl.setStudentNo(wjxDjxx.getCreateBy()); - zyInfoScjl.setStudentName(wjxDjxx.getUserName()); - zyInfoScjlService.save(zyInfoScjl); } - wjxWjxx.setSfsckhcl("1"); - wjxWjxx.setSfsckhclTime(new Date()); - baseMapper.updateById(wjxWjxx); - } } + + }catch (Exception e) { e.printStackTrace(); } } + public String getAccessToken(){ + String token=""; + try { + // 获取令牌URL前缀 + String prefixUrl = "https://intf.nenu.edu.cn/api/bd-api"; + // 开发者帐号,以实际为准 + String userName = "D64A8E04B63AE18D1D796914279AEEE3"; + // 开发者密码,以实际为准 + String password = "6413C873CD49C96D301B0D7A0EBFA51D"; + //NO.1：通过client_id:client_secret 和开发者账号和密码获取授权令牌access_token + RestTemplate restTemplate = new RestTemplate(); + + //构建请求头信息 + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); +// headers.add("Content-Type", "application/json"); + headers.add("Authorization", "Basic ZDhiZGU5NjZjYmEyNGVjX3V1aWQ6YTE4MjY3ZjExOTBmZTRjYzcyMTMxNDQ5ZDIyY2FhMDg="); + + //获取access_token + HttpEntity request = new HttpEntity(headers); + +// userName=DesUtil.encrypt(userName); +// password=DesUtil.encrypt(password); + String url= prefixUrl+"/oauth/token?grant_type=password&scope=read&username="+userName+"&password="+password; + + ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, request, Object.class);; + + LinkedHashMap map = (LinkedHashMap)response.getBody(); + + //从返回结果中获取 access_token + token = (String)map.get("access_token"); + + } catch (Exception e) { + e.printStackTrace(); + } + return token; + } + + // appId private static final String appId = "wx031697a8ca09a5ce";//东师 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java index 54a1b67a..1c40bbf5 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java @@ -758,7 +758,7 @@ public class ZyInfoController extends JeecgController { //删除老师留过的作业，重新生成新的 QueryWrapper query = new QueryWrapper<>(); query.eq("rwbh", zyInfo.getRwbh()); - query.eq("create_by",zyInfo.getCreateBy()); +// query.eq("create_by",zyInfo.getCreateBy()); query.eq("zy_leixing","0"); List oldList = zyInfoService.list(query); zyInfoService.remove(query); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java index 76e57346..a80ac2d0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java @@ -454,13 +454,20 @@ public class ZyInfoStudentController extends JeecgController zyInfoStudentUp = new UpdateWrapper<>(); zyInfoStudentUp.eq("id",par.getId()); + + String a = StringUtils.isNotEmpty(par.getScore())?par.getScore():"0"; + String b = StringUtils.isNotEmpty(par.getJxfs())?par.getJxfs():"0"; + String e = StringUtils.isNotEmpty(par.getJxfs2())?par.getJxfs2():"0"; + Double d = Double.parseDouble(a)+Double.parseDouble(b)+Double.parseDouble(e); + if(d>100){ + d = 100.0; + } + String c = String.format("%.1f",d); if(StringUtils.isEmpty(par.getScore())){ zyInfoStudentUp.set("score","0"); - zyInfoStudentUp.set("zzdf","0"); - }else{ - zyInfoStudentUp.set("zzdf",par.getScore()); } - zyInfoStudentUp.set("score_fabu","1"); + zyInfoStudentUp.set("zzdf",c); + zyInfoStudentUp.set("score_fabu","1"); zyInfoStudentService.update(zyInfoStudentUp); } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java index 8489fb02..6295d533 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java @@ -15,6 +15,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.NumberFormat; /** * @Description: 学生提交作业 @@ -65,14 +66,19 @@ public class ZyInfoStudent implements Serializable { @Excel(name = "提交时间", width = 15,format = "yyyy-MM-dd") private java.util.Date publishTime; - @Excel(name = "教师评分", width = 15) + @Excel(name = "教师评分", width = 15, type = 4) private java.lang.String score; @Excel(name = "互评分数", width = 15) private String xshpfs; + @Excel(name = "绩效分", width = 15) + @TableField(exist = false) + private String jxzf; + private String jxfs; - @Excel(name = "最终得分", width = 15) + + @Excel(name = "最终得分", width = 15,type=4) private String zzdf; @Excel(name = "最高查重率", width = 15) @TableField(exist = false) @@ -136,8 +142,6 @@ public class ZyInfoStudent implements Serializable { - @TableField(exist = false) - private String jxzf; @TableField(exist = false) private String catename; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudentExport.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudentExport.java new file mode 100644 index 00000000..17d79f0f --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudentExport.java @@ -0,0 +1,227 @@ +package org.jeecg.modules.kc.zyInfoStudent.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 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.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 学生提交作业 + * @Author: jeecg-boot + * @Date: 2024-05-06 + * @Version: V1.0 + */ +@Data +@TableName("zy_info_student") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_info_student对象", description="学生提交作业") +public class ZyInfoStudentExport implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**updateBy*/ + @ApiModelProperty(value = "updateBy") + private String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "updateTime") + private Date updateTime; + + + @Excel(name = "学生姓名", width = 15) + @ApiModelProperty(value = "studentName") + private String studentName; + @Excel(name = "学生学号", width = 15) + @ApiModelProperty(value = "createBy") + private String createBy; + @Excel(name = "专业名称", width = 15) + @ApiModelProperty(value = "zymc") + @TableField(exist = false) + private String zymc; + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "createTime") + private Date createTime; + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @Excel(name = "提交时间", width = 15,format = "yyyy-MM-dd") + private Date publishTime; + + @Excel(name = "教师评分", width = 15) + private int score; + + @Excel(name = "互评分数", width = 15) + private String xshpfs; + @Excel(name = "绩效分", width = 15) + private String jxfs; + @Excel(name = "最终得分", width = 15) + private int zzdf; + @Excel(name = "最高查重率", width = 15) + @TableField(exist = false) + private String zgccl;//最高相似律 + + /**外网相似律*/ +// @Excel(name = "维普查重（%）", width = 15) + @ApiModelProperty(value = "维普查重（%）") + private String wwxsl; + /**内网相似律*/ +// @Excel(name = "作业查重（%）", width = 15) + @ApiModelProperty(value = "作业查重（%）") + private String nwxsl; + /**aigc相似律*/ +// @Excel(name = "aigc查重（%）", width = 15) + @ApiModelProperty(value = "aigc查重（%）") + private String aigcxsl; + /**校内相似律*/ +// @Excel(name = "校内查重（%）", width = 15) + @ApiModelProperty(value = "校内查重（%）") + private String xnxsl; +// @Excel(name = "标记作业", width = 15,dicCode = "cdlx") + @Dict(dicCode = "cdlx") + private String cdlx;//存档类型 + + + /**作业名称*/ + @ApiModelProperty(value = "作业名称") + private String mainId; + /**作业附件*/ + @ApiModelProperty(value = "作业附件") + private String filePath; + /**外网是否通过*/ + @ApiModelProperty(value = "外网是否通过") + private String wwsftg; + /**内网是否通过*/ + @ApiModelProperty(value = "内网是否通过") + private String nwsftg; + /**aigc是否通过*/ + @ApiModelProperty(value = "aigc是否通过") + private String aigcsftg; + /**校内是否通过*/ + @ApiModelProperty(value = "校内是否通过") + private String xnsftg; + + private String pdfPath; + private String scoreFabu; + private String hpcs; + private String jxfs2; + private String zyLeixing;//作业类型 0课程作业 1期末作业 + private String pyContent;//批阅内容 + private String pyFilePath;//批阅附件 + private String sfsckhcl;//是否上传考核材料（0否 1是） + private String fwqPath;//文件服务器存储地址 + private String pyFwqFilePath;//评阅附件存储地址 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "考核材料提交时间", width = 15,format = "yyyy-MM-dd HH:mm:ss") + private Date khclTime; + + + + + @TableField(exist = false) + private String jxzf; + + @TableField(exist = false) + private String catename; + @TableField(exist = false) + private String cateid; + + @TableField(exist = false) + private String wwcc; + @TableField(exist = false) + private String nwcc; + @TableField(exist = false) + private String aigccc; + @TableField(exist = false) + private String xncc; + @TableField(exist = false) + private String zyname; + @TableField(exist = false) + private String teacherNo; + @TableField(exist = false) + private String rwbh; + + + @TableField(exist = false) + private String ccType; + @TableField(exist = false) + private String paperviewurl; + @TableField(exist = false) + private String paperdownurl; + + @TableField(exist = false) + private String wwpaperviewurl;//外网预览 + @TableField(exist = false) + private String wwpaperdownurl;//外网下载 + @TableField(exist = false) + private String zypaperviewurl;//作业预览 + @TableField(exist = false) + private String zypaperdownurl;//作业下载 + @TableField(exist = false) + private String xxpaperviewurl;//学校预览 + @TableField(exist = false) + private String xxpaperdownurl;//学校下载 + @TableField(exist = false) + private String aigcpaperviewurl;//aigc预览 + @TableField(exist = false) + private String aigcpaperdownurl;//aigc外网下载 + + @TableField(exist = false) + private String filestateid;// + @TableField(exist = false) + private String message;// + @TableField(exist = false) + private String wwfilestateid;//外网状态 + @TableField(exist = false) + private String wwmessage;//外网说明 + @TableField(exist = false) + private String zyfilestateid;//作业状态 + @TableField(exist = false) + private String zymessage;//作业说明 + @TableField(exist = false) + private String aigcfilestateid;//aigc状态 + @TableField(exist = false) + private String aigcmessage;//aigc说明 + @TableField(exist = false) + private String xxfilestateid;//学校状态 + @TableField(exist = false) + private String xxmessage;//学校说明 + @TableField(exist = false) + private String queryType;//作业状态查询 + @TableField(exist = false) + private String alltgl;//通过率 + @TableField(exist = false) + private String sfpf;//是否评分 + @TableField(exist = false) + private String zytitle;//作业名称 + @TableField(exist = false) + private String stuScore;//作业名称 + @TableField(exist = false) + private String pfbz;//评分标准 + @TableField(exist = false) + private String sturead;//评分标准是否允许学生查看 + @TableField(exist = false) + private String ywid;//业务id + @TableField(exist = false) + private String stuId;//学生作业临时id + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml index cab71b51..17d2cc93 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml @@ -13,6 +13,7 @@