From 00b8b19f3d9b8278e82b07c8eaebdbb3ebdd55d5 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 23 Jul 2024 15:25:19 +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 --- .../zyInfoStudent/entity/ZyInfoStudent.java | 16 ++-- .../mapper/ZyInfoStudentMapper.java | 5 ++ .../mapper/xml/ZyInfoStudentMapper.xml | 13 ++++ .../impl/ZyInfoStudentServiceImpl.java | 73 ++++++++++++++++++- 4 files changed, 98 insertions(+), 9 deletions(-) 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 d6974aa2..bd6de5c7 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 @@ -64,16 +64,16 @@ public class ZyInfoStudent implements Serializable { @Excel(name = "评分", width = 15) private java.lang.String score; /**外网相似律*/ - @Excel(name = "外网相似律", width = 15) - @ApiModelProperty(value = "外网相似律") + @Excel(name = "维普查重（%）", width = 15) + @ApiModelProperty(value = "维普查重（%）") private java.lang.String wwxsl; /**内网相似律*/ - @Excel(name = "内网相似律", width = 15) - @ApiModelProperty(value = "内网相似律") + @Excel(name = "作业查重（%）", width = 15) + @ApiModelProperty(value = "作业查重（%）") private java.lang.String nwxsl; /**aigc相似律*/ - @Excel(name = "aigc相似律", width = 15) - @ApiModelProperty(value = "aigc相似律") + @Excel(name = "aigc查重（%）", width = 15) + @ApiModelProperty(value = "aigc查重（%）") private java.lang.String aigcxsl; @Excel(name = "存档类型", width = 15,dicCode = "cdlx") @Dict(dicCode = "cdlx") @@ -99,8 +99,8 @@ public class ZyInfoStudent implements Serializable { @ApiModelProperty(value = "校内是否通过") private java.lang.String xnsftg; /**校内相似律*/ - @Excel(name = "校内相似律", width = 15) - @ApiModelProperty(value = "校内相似律") + @Excel(name = "校内查重（%）", width = 15) + @ApiModelProperty(value = "校内查重（%）") private java.lang.String xnxsl; private java.lang.String pdfPath; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java index b44caace..3146a0cf 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java @@ -10,6 +10,7 @@ import org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent; import org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudentSys; import java.util.List; +import java.util.Map; /** * @Description: 学生提交作业 @@ -28,4 +29,8 @@ public interface ZyInfoStudentMapper extends BaseMapper { IPage sysList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper, ZyInfoStudentSys zyInfoStudentSys); List exportSysXls(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, ZyInfoStudentSys zyInfoStudentSys); + + String getWpFile(ZyInfoStudent zyInfoStudent); + + Map getXfwWpFile(ZyInfoStudent zyInfoStudent); } 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 643d66c4..1fad23d8 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 @@ -121,4 +121,17 @@ + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java index b2b51636..aaf09ff1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java @@ -121,6 +121,37 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl paperids1 = baseMapper.getXfwWpFile(zyInfoStudent); + if(paperids1 != null){ + String dataids = paperids1.get("paperid"); + String bdkbs = paperids1.get("bdkbs"); + String url = "https://vims.fanyu.com/toole/smallcheck/delData"; + delXfwWpFile(url,bdkbs,dataids,response); + } + zyInfoStudent.setQueryType("3");//内网查重数据-全校内比对 + Map paperids3 = baseMapper.getXfwWpFile(zyInfoStudent); + if(paperids3 != null){ + String dataids = paperids3.get("paperid"); + String bdkbs = paperids3.get("bdkbs"); + String url = "https://vims.fanyu.com/toole/smallcheck/delData"; + delXfwWpFile(url,bdkbs,dataids,response); + } + zyInfoStudent.setQueryType("2");//aigc查重数据 + String paperids2 = baseMapper.getWpFile(zyInfoStudent); + if(StringUtils.isNotEmpty(paperids2)){ + String url = "https://vims.fanyu.com/tool/AIGCCheck/paperDel"; + delWpFile(url,paperids2,response); + } + + //外网查重及提交检测 if(StringUtils.equals(zyInfo.getWwcc(),"1")){ wwccSave(zyInfoStudent,response); @@ -550,7 +581,47 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl textMap = new HashMap(); + //可以设置多个input的name，value + String sign = getSign(); + textMap.put("sign", sign); + textMap.put("userid", weipuId); + textMap.put("paperids", paperids);//文档paperid集合,多个请用英文逗号隔开 + String contentType = "";//image/png + String ret = formUpload(url, textMap, null,contentType); + log.error("1-------->"+ret); + JSONObject object= JSONObject.parseObject(ret); + if("true".equals(object.getString("success"))){ + String message = object.getString("message"); + log.info("2-------->"+message); + return "success"; + }else{ + return "false"; + } + } + private String delXfwWpFile(String url,String cateid,String paperids,HttpServletResponse response) { +// String url = "https://vims.fanyu.com/toole/jianceorgan/paperdel.aspx"; + Map textMap = new HashMap(); + //可以设置多个input的name，value + String sign = getSign(); + textMap.put("sign", sign); + textMap.put("userid", weipuId); + textMap.put("cateid", cateid); + textMap.put("dataid", paperids);//文档paperid集合,多个请用英文逗号隔开 + String contentType = "";//image/png + String ret = formUpload(url, textMap, null,contentType); + log.error("1-------->"+ret); + JSONObject object= JSONObject.parseObject(ret); + if("true".equals(object.getString("success"))){ + String message = object.getString("message"); + log.info("2-------->"+message); + return "success"; + }else{ + return "false"; + } + } /** * 获取文件真实路径 * @param path