This commit is contained in:
parent
fcde7c9ed8
commit
0bc1852af1
|
@ -208,9 +208,9 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
|
|||
}
|
||||
queryWrapper.eq("dwmc ",xxhbUser.getDwmc());
|
||||
}
|
||||
queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0) or (zt= '离职' and ytkcs-0 >0))");
|
||||
queryWrapper.apply("(zt = '在职' )");
|
||||
// queryWrapper.eq("zt","在职");
|
||||
// queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0))");
|
||||
// queryWrapper.apply("(zt = '在职' or ( ytkcs-0 >0))");
|
||||
// queryWrapper.apply("dwmc in (select kkdw from kc_kkdw21_view)");
|
||||
Page<KcExportConfigTpkwcqkjzglx> page = new Page<>(pageNo, pageSize);
|
||||
IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper);
|
||||
|
@ -277,7 +277,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
|
|||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper = QueryGenerator.initQueryWrapper(kcExportConfigTpkwcqkjzglx, req.getParameterMap());
|
||||
queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0) or (zt= '离职' and ytkcs-0 >0))");
|
||||
queryWrapper.apply("(zt = '在职' )");
|
||||
Page<KcExportConfigTpkwcqkjzglx> page = new Page<>(pageNo, pageSize);
|
||||
IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.list3(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
|
@ -429,7 +429,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
|
|||
queryWrapper.in("id",selectionList);
|
||||
}
|
||||
// queryWrapper.eq("zt","在职");
|
||||
queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0) or (zt= '离职' and ytkcs-0 >0))");
|
||||
queryWrapper.apply("(zt = '在职')");
|
||||
queryWrapper.apply("dwmc in (select kkdw from kc_kkdw21_view)");
|
||||
// Step.2 获取导出数据
|
||||
List<KcExportConfigTpkwcqkjzglx> exportList = service.list(queryWrapper);
|
||||
|
@ -487,7 +487,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
|
|||
}
|
||||
queryWrapper.eq("dwmc ",xxhbUser.getDwmc());
|
||||
}
|
||||
queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0) or (zt= '离职' and ytkcs-0 >0))");
|
||||
queryWrapper.apply("(zt = '在职' )");
|
||||
// 过滤选中数据
|
||||
String selections = request.getParameter("selections");
|
||||
if (oConvertUtils.isNotEmpty(selections)) {
|
||||
|
@ -495,7 +495,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
|
|||
queryWrapper.in("id",selectionList);
|
||||
}
|
||||
// queryWrapper.eq("zt","在职");
|
||||
// queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0))");
|
||||
// queryWrapper.apply("(zt = '在职' or ( ytkcs-0 >0))");
|
||||
// queryWrapper.apply("dwmc in (select kkdw from kc_kkdw21_view)");
|
||||
// Step.2 获取导出数据
|
||||
queryWrapper.groupBy("gh,xm");
|
||||
|
@ -519,10 +519,10 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
|
|||
QueryWrapper<KcEvaluation> kcEvaluationQueryWrapper = new QueryWrapper<>();
|
||||
kcEvaluationQueryWrapper.eq("xqxn",object.getXqxn());
|
||||
kcEvaluationQueryWrapper.eq(StringUtils.isNotBlank(object.getDwmc()),"dwmc",object.getDwmc());
|
||||
kcEvaluationQueryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0))");
|
||||
kcEvaluationQueryWrapper.apply("(zt = '在职' )");
|
||||
kcEvaluationQueryWrapper.groupBy("a.gh,a.tklx");
|
||||
|
||||
// where xqxn = #{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0))
|
||||
// where xqxn = #{xqxn} and (zt = '在职' or ( ytkcs-0 >0))
|
||||
// <if test="code != null">
|
||||
// and tklx in (${code})
|
||||
// </if>
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
|
||||
|
||||
<select id="getTjlist" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">
|
||||
select count(tklx) as znum from kc_export_config_tpkwcqkjzglx where xqxn = #{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0))
|
||||
select count(tklx) as znum from kc_export_config_tpkwcqkjzglx where xqxn = #{xqxn} and (zt = '在职')
|
||||
and tklx in (${tklx})
|
||||
<if test="dwmc != null and dwmc != ''">
|
||||
and dwmc = #{dwmc}
|
||||
|
@ -69,7 +69,7 @@
|
|||
select a.tklx,a.gh,a.xm,a.dwmc,a.ytkcs,a.rjzy,count(c.upuserid) as sjtkcs from kc_export_config_tpkwcqkjzglx a
|
||||
LEFT JOIN kc_xqxn_history b on a.xqxn = b.title
|
||||
LEFT JOIN kc_evaluation c on a.gh = c.upuserid and c.up_date BETWEEN b.start_time and b.end_time
|
||||
where xqxn = #{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0)) and tklx in (${tklx})
|
||||
where xqxn = #{xqxn} and (zt = '在职' ) and tklx in (${tklx})
|
||||
<if test="dwmc != null and dwmc != ''">
|
||||
and dwmc = #{dwmc}
|
||||
</if>
|
||||
|
@ -82,7 +82,7 @@
|
|||
select GROUP_CONCAT(a.tklx) as tklx,a.gh,a.xm,a.dwmc,max(a.ytkcs) ytkcs,a.rjzy,count(c.upuserid) as sjtkcs from kc_export_config_tpkwcqkjzglx a
|
||||
LEFT JOIN kc_xqxn_history b on a.xqxn = b.title
|
||||
LEFT JOIN kc_evaluation c on a.gh = c.upuserid and c.up_date BETWEEN b.start_time and b.end_time
|
||||
where xqxn = #{kcExportConfigTpkwcqkjzglx.xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0)) and tklx in (${kcExportConfigTpkwcqkjzglx.code})
|
||||
where xqxn = #{kcExportConfigTpkwcqkjzglx.xqxn} and (zt = '在职' ) and tklx in (${kcExportConfigTpkwcqkjzglx.code})
|
||||
<if test="kcExportConfigTpkwcqkjzglx.dwmc != null and kcExportConfigTpkwcqkjzglx.dwmc != ''">
|
||||
and dwmc = #{kcExportConfigTpkwcqkjzglx.dwmc}
|
||||
</if>
|
||||
|
@ -109,7 +109,7 @@
|
|||
<!-- LEFT JOIN kc_xqxn_history b on a.xqxn = b.title-->
|
||||
<!-- LEFT JOIN kc_evaluation c on a.gh = c.upuserid and c.up_date BETWEEN b.start_time and b.end_time-->
|
||||
<!-- LEFT JOIN kc_kkdw d on a.dwmc = d.kkdw-->
|
||||
<!-- where xqxn = #{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0)) and tklx in (${code}) and dwjc is not null-->
|
||||
<!-- where xqxn = #{xqxn} and (zt = '在职' or ( ytkcs-0 >0)) and tklx in (${code}) and dwjc is not null-->
|
||||
<!-- GROUP BY d.dwjc-->
|
||||
<!-- ) a-->
|
||||
<!-- left join kc_kkdw21_view b on a.dwbh = b.dwbh-->
|
||||
|
@ -140,8 +140,7 @@
|
|||
a.xqxn = #{xqxn}
|
||||
AND a.tklx in (${code}) -- 学院教务委员会(code)
|
||||
AND (
|
||||
a.zt = '在职'
|
||||
OR ( a.zt = '退休' AND a.ytkcs - 0 > 0 ))) a
|
||||
a.zt = '在职')) a
|
||||
LEFT JOIN kc_xqxn_history b ON a.xqxn = b.title
|
||||
LEFT JOIN kc_kkdw21_view d ON a.dwmc = d.kkdw
|
||||
GROUP BY
|
||||
|
@ -188,7 +187,7 @@
|
|||
|
||||
AND (
|
||||
zt = '在职'
|
||||
OR ( zt = '退休' AND ytkcs - 0 > 0 ))) c
|
||||
)) c
|
||||
WHERE
|
||||
a.upuserid = c.gh
|
||||
AND a.up_date BETWEEN b.start_time
|
||||
|
@ -223,7 +222,7 @@
|
|||
select a.tklx,a.gh,a.xm,a.dwmc,a.ytkcs,a.rjzy,count(c.upuserid) as sjtkcs from kc_export_config_tpkwcqkjzglx a
|
||||
LEFT JOIN kc_xqxn_history b on a.xqxn = b.title
|
||||
LEFT JOIN kc_evaluation c on a.gh = c.upuserid and c.up_date BETWEEN b.start_time and b.end_time
|
||||
where xqxn=#{kcExportConfigTpkwcqkjzglx.xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0)) and rjzy is not null
|
||||
where xqxn=#{kcExportConfigTpkwcqkjzglx.xqxn} and (zt = '在职') and rjzy is not null
|
||||
<if test="kcExportConfigTpkwcqkjzglx.dwmc != null and kcExportConfigTpkwcqkjzglx.dwmc != ''">
|
||||
and a.dwmc = #{kcExportConfigTpkwcqkjzglx.dwmc}
|
||||
</if>
|
||||
|
@ -235,7 +234,7 @@
|
|||
select a.tklx,a.gh,a.xm,a.dwmc,a.ytkcs,a.rjzy,count(c.upuserid) as sjtkcs from kc_export_config_tpkwcqkjzglx a
|
||||
LEFT JOIN kc_xqxn_history b on a.xqxn = b.title
|
||||
LEFT JOIN kc_evaluation c on a.gh = c.upuserid and c.up_date BETWEEN b.start_time and b.end_time
|
||||
where xqxn=#{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0)) and rjzy is not null
|
||||
where xqxn=#{xqxn} and (zt = '在职' ) and rjzy is not null
|
||||
<if test="dwmc != null and dwmc != ''">
|
||||
and a.dwmc = #{dwmc}
|
||||
</if>
|
||||
|
@ -249,7 +248,7 @@
|
|||
select a.tklx,a.gh,a.xm,a.dwmc,a.ytkcs,a.rjzy,count(c.upuserid) as sjtkcs from kc_export_config_tpkwcqkjzglx a
|
||||
LEFT JOIN kc_xqxn_history b on a.xqxn = b.title
|
||||
LEFT JOIN kc_evaluation c on a.gh = c.upuserid and c.up_date BETWEEN b.start_time and b.end_time
|
||||
where xqxn = #{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0))
|
||||
where xqxn = #{xqxn} and (zt = '在职' )
|
||||
<if test="code != null">
|
||||
and tklx in (${code})
|
||||
</if>
|
||||
|
@ -272,7 +271,7 @@
|
|||
|
||||
|
||||
<select id="getDqxqtjlist" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">
|
||||
select count(*) as znum from kc_export_config_tpkwcqkjzglx where xqxn = #{xqxn} and (zt = '在职' or zt= '退休')
|
||||
select count(*) as znum from kc_export_config_tpkwcqkjzglx where xqxn = #{xqxn} and (zt = '在职' )
|
||||
</select>
|
||||
|
||||
<select id="getBxqSaveList" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">
|
||||
|
|
|
@ -135,7 +135,7 @@ public class SyncTJzgXskc extends BaseSync {
|
|||
// String endSj = DateUtil.format(endSjDate,DatePattern.NORM_DATETIME_FORMAT);
|
||||
xqxn = common.getTitle();
|
||||
ectQw.eq("xqxn",xqxn);
|
||||
ectQw.in("zt","在职","退休");
|
||||
ectQw.in("zt","在职");
|
||||
} else {
|
||||
xqxn = null;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,59 @@
|
|||
package org.jeecg.modules.kc.grab.SynchronizationService;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
|
||||
import org.jeecg.modules.kc.wjxWjxx.service.IWjxWjxxService;
|
||||
import org.jeecg.modules.kc.zyCcjg.service.IZyCcjgService;
|
||||
import org.jeecg.modules.kc.zyInfo.service.IZyInfoService;
|
||||
import org.quartz.JobExecutionContext;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 值修改外网查重《大学生版,检测次数不足》的作业信息
|
||||
*/
|
||||
@Slf4j
|
||||
public class SyncZyCxtjWwcc extends BaseSync {
|
||||
|
||||
@Autowired
|
||||
private IZyCcjgService zyCcjgService;
|
||||
|
||||
@Autowired
|
||||
private IZyInfoService zyInfoService;
|
||||
@Autowired
|
||||
private IWjxWjxxService wjxWjxxService;
|
||||
|
||||
/**
|
||||
* 若参数变量名修改 QuartzJobController中也需对应修改
|
||||
*/
|
||||
|
||||
@Override
|
||||
public void execute(JobExecutionContext jobExecutionContext) {
|
||||
start();
|
||||
run(getParamMap());
|
||||
end();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 有参定时任务实现
|
||||
* @param param
|
||||
*/
|
||||
public void run(Map<String, Object> param){
|
||||
try {
|
||||
//值修改外网查重《大学生版,检测次数不足》的作业信息
|
||||
zyCcjgService.getCxtjWwcc();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 无参定时任务实现
|
||||
*/
|
||||
public void run(){
|
||||
run(null);
|
||||
}
|
||||
|
||||
}
|
|
@ -8,7 +8,7 @@
|
|||
a.id AS yyid,a.isdeleted
|
||||
FROM
|
||||
kc_yuyue a
|
||||
LEFT JOIN kc_ketangbiao kt ON a.ketangbiaoid = kt.id
|
||||
LEFT JOIN kc_ketangbiao kt ON a.rwbh = kt.rwbh and a.skrq = kt.skrq
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
|
|
|
@ -745,7 +745,7 @@ public class WjxWjxxServiceImpl extends ServiceImpl<WjxWjxxMapper, WjxWjxx> impl
|
|||
String url = prefixUrl + "/oauth/token?grant_type=password&scope=read&username=" + userName + "&password=" + password;
|
||||
|
||||
ResponseEntity<Object> response = restTemplate.exchange(url, HttpMethod.POST, request, Object.class);
|
||||
;
|
||||
|
||||
|
||||
LinkedHashMap<String, Object> map = (LinkedHashMap<String, Object>) response.getBody();
|
||||
|
||||
|
|
|
@ -23,4 +23,6 @@ public interface ZyCcjgMapper extends BaseMapper<ZyCcjg> {
|
|||
void deleteByZystuid(@Param("zyStuId") String zyStuId);
|
||||
|
||||
List<ZyCcjg> ccjglist(@Param(Constants.WRAPPER) QueryWrapper<ZyCcjg> queryWrapper);
|
||||
|
||||
void deleteByZystuidByZero(@Param("zyStuId") String id);
|
||||
}
|
||||
|
|
|
@ -17,6 +17,12 @@
|
|||
WHERE
|
||||
zy_stu_id = #{zyStuId}
|
||||
</delete>
|
||||
<delete id="deleteByZystuidByZero" parameterType="java.lang.String">
|
||||
DELETE
|
||||
FROM zy_ccjg
|
||||
WHERE
|
||||
zy_stu_id = #{zyStuId} and cc_type = 0
|
||||
</delete>
|
||||
|
||||
<select id="ccjglist" resultType="org.jeecg.modules.kc.zyCcjg.entity.ZyCcjg">
|
||||
select a.cc_type,if(cc_type = 2,a.ai_rate,a.percentage) as percentage,a.human_rate,b.student_name as stuName,a.create_by as stuNo,a.paperviewurl,
|
||||
|
|
|
@ -33,4 +33,6 @@ public interface IZyCcjgService extends IService<ZyCcjg> {
|
|||
void getCxtj();
|
||||
|
||||
void getCxtjParam(Map<String, Object> param);
|
||||
|
||||
void getCxtjWwcc();
|
||||
}
|
||||
|
|
|
@ -200,6 +200,15 @@ public class ZyCcjgServiceImpl extends ServiceImpl<ZyCcjgMapper, ZyCcjg> impleme
|
|||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getCxtjWwcc() {
|
||||
List<ZyInfoStudent> list = zyInfoNewStudent2Service.cxtjByJccsbz();
|
||||
for(ZyInfoStudent zyInfoStudent:list){
|
||||
HttpServletResponse response = null;
|
||||
zyInfoNewStudent2Service.stuWpwwjc(zyInfoStudent,response);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public Map<String,String> aigcCxjcjg(ZyCcjg zyCcjg) {
|
||||
String url = "https://vims.fanyu.com/tool/AIGCCheck/searchPaper";
|
||||
|
@ -271,9 +280,9 @@ public class ZyCcjgServiceImpl extends ServiceImpl<ZyCcjgMapper, ZyCcjg> impleme
|
|||
zyInfoStudent.setAigcxsl(cctgl+"");
|
||||
zyInfoStudentService.updateById(zyInfoStudent);
|
||||
}else if(StringUtils.equals("3",object2.getString("filestateid"))){
|
||||
zyInfoStudent.setWwsftg("失败:"+object.getString("message"));
|
||||
zyInfoStudent.setAigcsftg("失败:"+object.getString("message"));
|
||||
}else{
|
||||
zyInfoStudent.setWwsftg("检测中");
|
||||
zyInfoStudent.setAigcsftg("检测中");
|
||||
}
|
||||
|
||||
//----------计算通过率--------------
|
||||
|
@ -316,6 +325,7 @@ public class ZyCcjgServiceImpl extends ServiceImpl<ZyCcjgMapper, ZyCcjg> impleme
|
|||
JSONArray jsonArray = (JSONArray) JSONArray.parse(listpaper);
|
||||
JSONObject object2= jsonArray.getJSONObject(0);
|
||||
String filestateid = object2.getString("filestateid");
|
||||
String message = object2.getString("papermsg");
|
||||
if(StringUtils.equals(filestateid,"0")){
|
||||
System.out.println(paperid+":未检测");
|
||||
}else if(StringUtils.equals(filestateid,"1")){
|
||||
|
@ -323,9 +333,9 @@ public class ZyCcjgServiceImpl extends ServiceImpl<ZyCcjgMapper, ZyCcjg> impleme
|
|||
}else if(StringUtils.equals(filestateid,"2")){
|
||||
System.out.println(paperid+":检测完成");
|
||||
}else if(StringUtils.equals(filestateid,"3")){
|
||||
System.out.println(paperid+":检测失败;"+object2.getString("message"));
|
||||
System.out.println(paperid+":检测失败;"+message);
|
||||
}else{
|
||||
System.out.println(paperid+":当前状态:"+filestateid+";"+object2.getString("message"));
|
||||
System.out.println(paperid+":当前状态:"+filestateid+";"+message);
|
||||
}
|
||||
System.out.println("listpaper----->"+listpaper);//结果结合
|
||||
System.out.println("object2----->"+object2);//实际单挑数据结果
|
||||
|
@ -339,7 +349,7 @@ public class ZyCcjgServiceImpl extends ServiceImpl<ZyCcjgMapper, ZyCcjg> impleme
|
|||
zyCcjg.setPaperword(object2.getString("paperword"));//论文字数
|
||||
zyCcjg.setPaperviewurl(object2.getString("paperviewurl"));//报告在线查看地址
|
||||
zyCcjg.setPaperdownurl(object2.getString("paperdownurl"));//报告下载地址
|
||||
zyCcjg.setMessage(object2.getString("message"));
|
||||
zyCcjg.setMessage(message);
|
||||
zyCcjg.setDuplicatepercentage(object2.getString("duplicatepercentage"));//复写率
|
||||
zyCcjg.setPaichupercentage(object2.getString("paichupercentage"));//他引率
|
||||
zyCcjg.setOwnpercentage(object2.getString("ownpercentage"));//自写率
|
||||
|
@ -371,8 +381,10 @@ public class ZyCcjgServiceImpl extends ServiceImpl<ZyCcjgMapper, ZyCcjg> impleme
|
|||
zyInfoStudentService.updateById(zyInfoStudent);
|
||||
}else if(StringUtils.equals("3",object2.getString("filestateid"))){
|
||||
zyInfoStudent.setWwsftg("失败:"+object.getString("message"));
|
||||
zyInfoStudentService.updateById(zyInfoStudent);
|
||||
}else{
|
||||
zyInfoStudent.setWwsftg("检测中");
|
||||
zyInfoStudentService.updateById(zyInfoStudent);
|
||||
}
|
||||
//----------计算通过率--------------
|
||||
|
||||
|
@ -391,7 +403,7 @@ public class ZyCcjgServiceImpl extends ServiceImpl<ZyCcjgMapper, ZyCcjg> impleme
|
|||
}
|
||||
}
|
||||
|
||||
//小范围比对查询检测结果
|
||||
//小范围比对查询检测结果(作业内比对)
|
||||
public Map<String,String> xfwbdCxjcjg(ZyCcjg zyCcjg) {
|
||||
String url = "https://vims.fanyu.com/toole/smallcheck/searchCheckStatus";
|
||||
//文件路径,文件存在,不存在的话需要先下载下来
|
||||
|
@ -469,9 +481,11 @@ public class ZyCcjgServiceImpl extends ServiceImpl<ZyCcjgMapper, ZyCcjg> impleme
|
|||
zyInfoStudent.setNwxsl(cctgl + "");
|
||||
zyInfoStudentService.updateById(zyInfoStudent);
|
||||
}else if(StringUtils.equals("3",object2.getString("filestateid"))){
|
||||
zyInfoStudent.setWwsftg("失败:"+object.getString("message"));
|
||||
zyInfoStudent.setNwsftg("失败:"+object.getString("message"));
|
||||
zyInfoStudentService.updateById(zyInfoStudent);
|
||||
}else{
|
||||
zyInfoStudent.setWwsftg("检测中");
|
||||
zyInfoStudent.setNwsftg("检测中");
|
||||
zyInfoStudentService.updateById(zyInfoStudent);
|
||||
}
|
||||
//----------计算通过率--------------
|
||||
|
||||
|
@ -584,9 +598,11 @@ public class ZyCcjgServiceImpl extends ServiceImpl<ZyCcjgMapper, ZyCcjg> impleme
|
|||
|
||||
|
||||
}else if(StringUtils.equals("3",object2.getString("filestateid"))){
|
||||
zyInfoStudent.setWwsftg("失败:"+object.getString("message"));
|
||||
zyInfoStudent.setXnsftg("失败:"+object.getString("message"));
|
||||
zyInfoStudentService.updateById(zyInfoStudent);
|
||||
}else{
|
||||
zyInfoStudent.setWwsftg("检测中");
|
||||
zyInfoStudent.setXnsftg("检测中");
|
||||
zyInfoStudentService.updateById(zyInfoStudent);
|
||||
}
|
||||
//----------计算通过率--------------
|
||||
|
||||
|
|
|
@ -177,7 +177,7 @@
|
|||
|
||||
|
||||
<select id="cxtjByJccsbz" resultType="org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent">
|
||||
select a.* from zy_info_student a ,
|
||||
select a.*,a.id as stuId from zy_info_student a ,
|
||||
(select distinct zy_stu_id from zy_ccjg where message = '大学生版,检测次数不足') b where a.id = b.zy_stu_id and a.file_path is not null
|
||||
</select>
|
||||
<select id="getZyStuId" resultType="org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent">
|
||||
|
@ -228,7 +228,7 @@
|
|||
|
||||
|
||||
<select id="getDtjzyxx" resultType="org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent">
|
||||
select a.*,a.id as stu_id from (select * from zy_info_student where main_id in (select id from zy_info where wwtgl is not null and create_time >='2025-01-01')) a
|
||||
select a.*,a.id as stu_id from (select * from zy_info_student where main_id in (select id from zy_info where wwcc = 'true' and create_time >='2025-01-01')) a
|
||||
LEFT JOIN zy_ccjg b on a.id = b.zy_stu_id
|
||||
where a.file_path is not null and a.wwxsl is null and b.id is null
|
||||
</select>
|
||||
|
|
|
@ -70,4 +70,6 @@ public interface IZyInfoStudent2Service extends IService<ZyInfoStudent> {
|
|||
List<ZyInfoStudent> getZyStuIdById(ZyXzryInfo zyXzryInfo);
|
||||
|
||||
void sckhclxb();
|
||||
|
||||
void stuWpwwjc(ZyInfoStudent zyInfoStudent,HttpServletResponse response);
|
||||
}
|
||||
|
|
|
@ -500,23 +500,23 @@ public class ZyInfoStudentService2Impl extends ServiceImpl<ZyInfoStudentMapper,
|
|||
|
||||
|
||||
//外网查重及提交检测
|
||||
// if(StringUtils.equals(zyInfo.getWwcc(),"true")){
|
||||
// wwccSave(zyInfoStudent,response);
|
||||
// }
|
||||
// //内网查重及提交检测
|
||||
// if(StringUtils.equals(zyInfo.getNwcc(),"true")){
|
||||
// nwccSave(zyInfoStudent,response);
|
||||
// }
|
||||
if(StringUtils.equals(zyInfo.getWwcc(),"true")){
|
||||
wwccSave(zyInfoStudent,response);
|
||||
}
|
||||
//内网查重及提交检测
|
||||
if(StringUtils.equals(zyInfo.getNwcc(),"true")){
|
||||
nwccSave(zyInfoStudent,response);
|
||||
}
|
||||
//aigc查重及提交检测
|
||||
if (StringUtils.equals(zyInfo.getAigccc(), "true")) {
|
||||
aigcSave(zyInfoStudent, response);
|
||||
}
|
||||
// //校内查重及提交检测
|
||||
// if(StringUtils.equals(zyInfo.getXncc(),"true")){
|
||||
// zyInfoStudent.setCateid("DBSDQXZYBDK001");
|
||||
// zyInfoStudent.setCatename("东北师大全校作业比对库");
|
||||
// xnccSave(zyInfoStudent,"1",response);//提交比对
|
||||
// }
|
||||
//校内查重及提交检测
|
||||
if(StringUtils.equals(zyInfo.getXncc(),"true")){
|
||||
zyInfoStudent.setCateid("DBSDQXZYBDK001");
|
||||
zyInfoStudent.setCatename("东北师大全校作业比对库");
|
||||
xnccSave(zyInfoStudent,"1",response);//提交比对
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -601,6 +601,46 @@ public class ZyInfoStudentService2Impl extends ServiceImpl<ZyInfoStudentMapper,
|
|||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void stuWpwwjc(ZyInfoStudent zyInfoStudent,HttpServletResponse response) {
|
||||
String fileName = getFileName(zyInfoStudent.getFilePath(), response);
|
||||
zyInfoStudent.setFilePath(fileName);
|
||||
System.out.println("----------------1---------------------" + zyInfoStudent.getStuId());
|
||||
if (StringUtils.isEmpty(zyInfoStudent.getStuId())) {
|
||||
QueryWrapper<ZyInfoStudent> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("a.main_id", zyInfoStudent.getId());
|
||||
queryWrapper.eq("a.create_by", zyInfoStudent.getCreateBy());
|
||||
List<ZyInfoStudent> list1 = baseMapper.selectList(queryWrapper);
|
||||
zyInfoStudent = list1.get(0);
|
||||
} else {
|
||||
zyInfoStudent = baseMapper.selectById(zyInfoStudent.getStuId());
|
||||
}
|
||||
|
||||
System.out.println("----------------2---------------------" + zyInfoStudent);
|
||||
ZyInfo zyInfo = zyInfoService.getById(zyInfoStudent.getMainId());
|
||||
System.out.println("----------------3---------------------" + zyInfo);
|
||||
|
||||
|
||||
String cateid = zyInfo.getId() + "" + zyInfo.getTitle();
|
||||
String catename = zyInfo.getTitle();
|
||||
zyInfoStudent.setCateid(cateid);
|
||||
zyInfoStudent.setCatename(catename);
|
||||
|
||||
System.out.println("----------------4---------------------");
|
||||
//删除维普已经提交的文档
|
||||
zyCcjgMapper.deleteByZystuidByZero(zyInfoStudent.getId());
|
||||
|
||||
System.out.println("----------------5---------------------");
|
||||
|
||||
//外网查重及提交检测
|
||||
if (StringUtils.equals(zyInfo.getWwcc(), "true")) {
|
||||
wwccSave(zyInfoStudent, response);
|
||||
}
|
||||
System.out.println("----------------6---------------------");
|
||||
}
|
||||
|
||||
public JSONObject getSycs(String url, String type) {
|
||||
Map<String, String> textMap = new HashMap<String, String>();
|
||||
//可以设置多个input的name,value
|
||||
|
@ -648,28 +688,28 @@ public class ZyInfoStudentService2Impl extends ServiceImpl<ZyInfoStudentMapper,
|
|||
}
|
||||
|
||||
private void delSysweipulunwen(ZyInfoStudent zyInfoStudent, HttpServletResponse response) {
|
||||
// zyInfoStudent.setQueryType("0");//外网查重数据
|
||||
// String paperids = baseMapper.getWpFile(zyInfoStudent);
|
||||
// if(StringUtils.isNotEmpty(paperids)){
|
||||
// String url = "https://vims.fanyu.com/toole/jianceorgan/paperdel.aspx";
|
||||
// delWpFile(url,paperids, response);
|
||||
// }
|
||||
// zyInfoStudent.setQueryType("1");//内网查重数据-作业内查重
|
||||
// Map<String,String> 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<String,String> 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("0");//外网查重数据
|
||||
String paperids = baseMapper.getWpFile(zyInfoStudent);
|
||||
if(StringUtils.isNotEmpty(paperids)){
|
||||
String url = "https://vims.fanyu.com/toole/jianceorgan/paperdel.aspx";
|
||||
delWpFile(url,paperids, response);
|
||||
}
|
||||
zyInfoStudent.setQueryType("1");//内网查重数据-作业内查重
|
||||
Map<String,String> 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<String,String> 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)) {
|
||||
|
@ -944,6 +984,11 @@ public class ZyInfoStudentService2Impl extends ServiceImpl<ZyInfoStudentMapper,
|
|||
String dataid = object2.getString("dataid");//资源id 后续提交比对/删除文档会试用
|
||||
zyCcjg.setPaperid(dataid);
|
||||
zyCcjgMapper.updateById(zyCcjg);
|
||||
|
||||
ZyInfoStudent zyInfoStudentUp = new ZyInfoStudent();
|
||||
zyInfoStudentUp.setId(zyInfoStudent.getId());
|
||||
zyInfoStudentUp.setAigcsftg("检测中");
|
||||
baseMapper.updateById(zyInfoStudentUp);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1017,6 +1062,10 @@ public class ZyInfoStudentService2Impl extends ServiceImpl<ZyInfoStudentMapper,
|
|||
//提交后直接开始检测
|
||||
String message = wwKsjc(zyCcjg);
|
||||
log.info("21-------->" + message);
|
||||
ZyInfoStudent zyInfoStudentUp = new ZyInfoStudent();
|
||||
zyInfoStudentUp.setId(zyInfoStudent.getId());
|
||||
zyInfoStudentUp.setWwsftg("检测中");
|
||||
baseMapper.updateById(zyInfoStudentUp);
|
||||
return message;
|
||||
} else {
|
||||
log.info("3-------->");
|
||||
|
@ -1026,6 +1075,10 @@ public class ZyInfoStudentService2Impl extends ServiceImpl<ZyInfoStudentMapper,
|
|||
zyCcjg.setCcType("0");//查重类型(0外网 1内网 2aigc)
|
||||
zyCcjg.setFilestateid("3");
|
||||
zyCcjgMapper.insert(zyCcjg);
|
||||
ZyInfoStudent zyInfoStudentUp = new ZyInfoStudent();
|
||||
zyInfoStudentUp.setId(zyInfoStudent.getId());
|
||||
zyInfoStudentUp.setWwsftg(object.getString("message"));
|
||||
baseMapper.updateById(zyInfoStudentUp);
|
||||
return "false";
|
||||
}
|
||||
}
|
||||
|
|
|
@ -265,7 +265,9 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
|||
try {
|
||||
Global global = SpringContextHolder.getBean(Global.class);
|
||||
FileUtil.mkdir(global.getContractDickPath());
|
||||
String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss");
|
||||
//六位随机数
|
||||
String r = RandomUtil.randomNumbers(6);
|
||||
String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss")+r;
|
||||
String docPath = upLoadPath+ File.separator+ zyInfoStudent.getFilePath();
|
||||
String namePath = dd + ".pdf";
|
||||
String pdfPath = global.getContractDickPath() + namePath;
|
||||
|
@ -504,23 +506,23 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
|||
|
||||
|
||||
//外网查重及提交检测
|
||||
// if(StringUtils.equals(zyInfo.getWwcc(),"true")){
|
||||
// wwccSave(zyInfoStudent,response);
|
||||
// }
|
||||
// //内网查重及提交检测
|
||||
// if(StringUtils.equals(zyInfo.getNwcc(),"true")){
|
||||
// nwccSave(zyInfoStudent,response);
|
||||
// }
|
||||
if(StringUtils.equals(zyInfo.getWwcc(),"true")){
|
||||
wwccSave(zyInfoStudent,response);
|
||||
}
|
||||
//内网查重及提交检测
|
||||
if(StringUtils.equals(zyInfo.getNwcc(),"true")){
|
||||
nwccSave(zyInfoStudent,response);
|
||||
}
|
||||
//aigc查重及提交检测
|
||||
if (StringUtils.equals(zyInfo.getAigccc(), "true")) {
|
||||
aigcSave(zyInfoStudent, response);
|
||||
}
|
||||
// //校内查重及提交检测
|
||||
// if(StringUtils.equals(zyInfo.getXncc(),"true")){
|
||||
// zyInfoStudent.setCateid("DBSDQXZYBDK001");
|
||||
// zyInfoStudent.setCatename("东北师大全校作业比对库");
|
||||
// xnccSave(zyInfoStudent,"1",response);//提交比对
|
||||
// }
|
||||
//校内查重及提交检测
|
||||
if(StringUtils.equals(zyInfo.getXncc(),"true")){
|
||||
zyInfoStudent.setCateid("DBSDQXZYBDK001");
|
||||
zyInfoStudent.setCatename("东北师大全校作业比对库");
|
||||
xnccSave(zyInfoStudent,"1",response);//提交比对
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -784,6 +786,10 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
|||
zyCcjg.setFilestateid("1");
|
||||
zyCcjgMapper.insert(zyCcjg);
|
||||
|
||||
ZyInfoStudent zyInfoStudentUp = new ZyInfoStudent();
|
||||
zyInfoStudentUp.setId(zyInfoStudent.getId());
|
||||
zyInfoStudentUp.setAigcsftg("检测中");
|
||||
baseMapper.updateById(zyInfoStudentUp);
|
||||
//提交后直接开始检测
|
||||
String message = aigcKsjc(zyCcjg);
|
||||
log.info("21-------->" + message);
|
||||
|
@ -796,6 +802,10 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
|||
zyCcjg.setCcType("2");//查重类型(0外网 1内网 2aigc)
|
||||
zyCcjg.setFilestateid("3");
|
||||
zyCcjgMapper.insert(zyCcjg);
|
||||
ZyInfoStudent zyInfoStudentUp = new ZyInfoStudent();
|
||||
zyInfoStudentUp.setId(zyInfoStudent.getId());
|
||||
zyInfoStudentUp.setAigcsftg(object.getString("message"));
|
||||
baseMapper.updateById(zyInfoStudentUp);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -865,6 +875,10 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
|||
zyCcjg.setBdkbs(zyInfoStudent.getCateid());
|
||||
zyCcjgMapper.insert(zyCcjg);
|
||||
|
||||
ZyInfoStudent zyInfoStudentUp = new ZyInfoStudent();
|
||||
zyInfoStudentUp.setId(zyInfoStudent.getId());
|
||||
zyInfoStudentUp.setNwsftg("检测中");
|
||||
baseMapper.updateById(zyInfoStudentUp);
|
||||
//提交后直接开始检测
|
||||
String message = xfwbdKsjc(zyCcjg, "1");
|
||||
log.info("21-------->" + message);
|
||||
|
@ -876,6 +890,10 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
|||
zyCcjg.setCcType("1");//查重类型(0外网 1内网 2aigc)
|
||||
zyCcjg.setFilestateid("3");
|
||||
zyCcjgMapper.insert(zyCcjg);
|
||||
ZyInfoStudent zyInfoStudentUp = new ZyInfoStudent();
|
||||
zyInfoStudentUp.setId(zyInfoStudent.getId());
|
||||
zyInfoStudentUp.setNwsftg(object.getString("message"));
|
||||
baseMapper.updateById(zyInfoStudentUp);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -932,6 +950,10 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
|||
//提交后直接开始检测
|
||||
String message = xfwbdKsjc(zyCcjg, "0");
|
||||
log.info("21-------->" + message);
|
||||
ZyInfoStudent zyInfoStudentUp = new ZyInfoStudent();
|
||||
zyInfoStudentUp.setId(zyInfoStudent.getId());
|
||||
zyInfoStudentUp.setXnsftg("检测中");
|
||||
baseMapper.updateById(zyInfoStudentUp);
|
||||
}
|
||||
|
||||
} else {
|
||||
|
@ -942,6 +964,10 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
|||
zyCcjg.setCcType("3");//查重类型(0外网 1内网 2aigc)
|
||||
zyCcjg.setFilestateid("3");
|
||||
zyCcjgMapper.insert(zyCcjg);
|
||||
ZyInfoStudent zyInfoStudentUp = new ZyInfoStudent();
|
||||
zyInfoStudentUp.setId(zyInfoStudent.getId());
|
||||
zyInfoStudentUp.setAigcsftg(object.getString("message"));
|
||||
baseMapper.updateById(zyInfoStudentUp);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1082,6 +1108,10 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
|||
//提交后直接开始检测
|
||||
String message = wwKsjc(zyCcjg);
|
||||
log.info("21-------->" + message);
|
||||
ZyInfoStudent zyInfoStudentUp = new ZyInfoStudent();
|
||||
zyInfoStudentUp.setId(zyInfoStudent.getId());
|
||||
zyInfoStudentUp.setWwsftg("检测中");
|
||||
baseMapper.updateById(zyInfoStudentUp);
|
||||
return message;
|
||||
} else {
|
||||
log.info("3-------->");
|
||||
|
@ -1091,6 +1121,10 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
|||
zyCcjg.setCcType("0");//查重类型(0外网 1内网 2aigc)
|
||||
zyCcjg.setFilestateid("3");
|
||||
zyCcjgMapper.insert(zyCcjg);
|
||||
ZyInfoStudent zyInfoStudentUp = new ZyInfoStudent();
|
||||
zyInfoStudentUp.setId(zyInfoStudent.getId());
|
||||
zyInfoStudentUp.setWwsftg(object.getString("message"));
|
||||
baseMapper.updateById(zyInfoStudentUp);
|
||||
return "false";
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue