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

修改bug

This commit is contained in:
yangjun 2024-11-27 14:33:43 +08:00
parent 039eed185a
commit 91e21dd8f6
8 changed files with 303 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SFTPUtil.java
View File

@ -64,10 +64,10 @@ public class SFTPUtil {
channel.connect(); channel.connect();
sftp = (ChannelSftp) channel; sftp = (ChannelSftp) channel;
logger.info("登录成功"); logger.info("登录成功");
}else{ // }else{
Channel channel = sshSession.openChannel("sftp"); // Channel channel = sshSession.openChannel("sftp");
channel.connect(); // channel.connect();
sftp = (ChannelSftp) channel; // sftp = (ChannelSftp) channel;
} }
} catch (Exception e){ } catch (Exception e){
try{ try{

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

@ -98,6 +98,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/wxpay/**", "anon");//微信接口 filterChainDefinitionMap.put("/wxpay/**", "anon");//微信接口
filterChainDefinitionMap.put("/temp/**", "anon");//微信接口 filterChainDefinitionMap.put("/temp/**", "anon");//微信接口
filterChainDefinitionMap.put("/kczx/**", "anon");//微信接口 filterChainDefinitionMap.put("/kczx/**", "anon");//微信接口
filterChainDefinitionMap.put("/v3/3rd/**", "anon");//wps接口
filterChainDefinitionMap.put("/sys/getLoginQrcode/**", "anon"); //登录二维码 filterChainDefinitionMap.put("/sys/getLoginQrcode/**", "anon"); //登录二维码
filterChainDefinitionMap.put("/sys/getQrcodeToken/**", "anon"); //监听扫码 filterChainDefinitionMap.put("/sys/getQrcodeToken/**", "anon"); //监听扫码

11
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZyCcjg.java
View File

@ -46,17 +46,6 @@ public class SyncZyCcjg extends BaseSync {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
try {
zyInfoService.updateInfoZyStatus();
} catch (Exception e) {
e.printStackTrace();
}
try {
wjxWjxxService.updateCeyanStatus();
} catch (Exception e) {
e.printStackTrace();
}
} }
/** /**

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

@ -0,0 +1,64 @@
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 SyncZyCyFbxx 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 {
zyInfoService.updateInfoZyStatus();
} catch (Exception e) {
e.printStackTrace();
}
try {
wjxWjxxService.updateCeyanStatus();
} catch (Exception e) {
e.printStackTrace();
}
}
/**
* 无参定时任务实现
*/
public void run(){
run(null);
}
}

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java
View File

@ -65,4 +65,6 @@ public interface WjxDjxxMapper extends BaseMapper<WjxDjxx> {
void updateScoreByJid(WjxDjxx par2); void updateScoreByJid(WjxDjxx par2);
WjxDjxx getInfoByVidUser(WjxDjxx wjxDjxx); WjxDjxx getInfoByVidUser(WjxDjxx wjxDjxx);
WjxDjxxTmxx getSfysj( @Param("wjxDjxxTmxx")WjxDjxxTmxx wjxDjxxTmxx);
} }

6
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml
View File

@ -74,6 +74,7 @@
delete from wjx_djxx_tmxx delete from wjx_djxx_tmxx
where vid = #{vid} where vid = #{vid}
and jid = #{jid} and jid = #{jid}
and item_score is not null
</update> </update>
<insert id="addDjTmxx" parameterType="org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxxTmxx"> <insert id="addDjTmxx" parameterType="org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxxTmxx">
@ -429,4 +430,9 @@
set score = #{score} set score = #{score}
where jid = #{jid} where jid = #{jid}
</update> </update>
<select id="getSfysj" resultType="org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxxTmxx">
select * from wjx_djxx_tmxx where vid = #{wjxDjxxTmxx.vid} and jid = #{wjxDjxxTmxx.jid} and wj_index = #{wjxDjxxTmxx.wjIndex} and item_index = #{wjxDjxxTmxx.itemIndex}
</select>
</mapper> </mapper>

392
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java
View File

@ -172,7 +172,8 @@ public class WjxDjxxServiceImpl extends ServiceImpl<WjxDjxxMapper, WjxDjxx> impl
baseMapper.deleteDjItem(wjxDjxx); baseMapper.deleteDjItem(wjxDjxx);
//处理选项 //处理选项
JSONObject answerItemJson = answer.getJSONObject("answer_items"); JSONObject answerItemJson = answer.getJSONObject("answer_items");
for(String key2 : answerItemJson.keySet()){ if(answerItemJson!=null) {
for (String key2 : answerItemJson.keySet()) {
JSONObject answerItem = answerItemJson.getJSONObject(key2); JSONObject answerItem = answerItemJson.getJSONObject(key2);
WjxDjxxTmxx wjxDjxxTmxx = new WjxDjxxTmxx(); WjxDjxxTmxx wjxDjxxTmxx = new WjxDjxxTmxx();
wjxDjxxTmxx.setVid(answerVid); wjxDjxxTmxx.setVid(answerVid);
@ -181,34 +182,34 @@ public class WjxDjxxServiceImpl extends ServiceImpl<WjxDjxxMapper, WjxDjxx> impl
wjxDjxxTmxx.setCreateBy(user.getUsername()); wjxDjxxTmxx.setCreateBy(user.getUsername());
wjxDjxxTmxx.setCreateTime(new Date()); wjxDjxxTmxx.setCreateTime(new Date());
if(answerItem.get("q_index")!=null){ if (answerItem.get("q_index") != null) {
Integer wjIndex = answerItem.getInteger("q_index"); Integer wjIndex = answerItem.getInteger("q_index");
wjxDjxxTmxx.setWjIndex(wjIndex); wjxDjxxTmxx.setWjIndex(wjIndex);
} }
if(answerItem.get("title")!=null){ if (answerItem.get("title") != null) {
String wjTitle = answerItem.getString("title"); String wjTitle = answerItem.getString("title");
wjxDjxxTmxx.setWjTitle(wjTitle); wjxDjxxTmxx.setWjTitle(wjTitle);
} }
if(answerItem.get("item_value")!=null){ if (answerItem.get("item_value") != null) {
Double itemScore = answerItem.getDouble("item_value"); Double itemScore = answerItem.getDouble("item_value");
wjxDjxxTmxx.setItemScore(itemScore); wjxDjxxTmxx.setItemScore(itemScore);
} }
if(answerItem.get("answer_text")!=null){ if (answerItem.get("answer_text") != null) {
String answerText = answerItem.getString("answer_text"); String answerText = answerItem.getString("answer_text");
wjxDjxxTmxx.setAnswerText(answerText); wjxDjxxTmxx.setAnswerText(answerText);
} }
if(answerItem.get("item_index")!=null){ if (answerItem.get("item_index") != null) {
JSONArray itemIndex = answerItem.getJSONArray("item_index"); JSONArray itemIndex = answerItem.getJSONArray("item_index");
QueryWrapper<WjxWjxx> wjxWjxxQueryWrapper = new QueryWrapper<>(); QueryWrapper<WjxWjxx> wjxWjxxQueryWrapper = new QueryWrapper<>();
wjxWjxxQueryWrapper.eq("vid",vid); wjxWjxxQueryWrapper.eq("vid", vid);
wjxWjxxQueryWrapper.last("limit 1"); wjxWjxxQueryWrapper.last("limit 1");
WjxWjxx wjxxPar= wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper); WjxWjxx wjxxPar = wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper);
if(itemIndex.size()>0){ if (itemIndex.size() > 0) {
for(Object index : itemIndex){ for (Object index : itemIndex) {
Integer ti = (Integer) index; Integer ti = (Integer) index;
@ -218,8 +219,8 @@ public class WjxDjxxServiceImpl extends ServiceImpl<WjxDjxxMapper, WjxDjxx> impl
try { try {
QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<>(); QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<>();
wjxWjxxTmlbQueryWrapper.eq("main_id",wjxxPar.getId()); wjxWjxxTmlbQueryWrapper.eq("main_id", wjxxPar.getId());
wjxWjxxTmlbQueryWrapper.eq("wj_index",wjxDjxxTmxx.getWjIndex()); wjxWjxxTmlbQueryWrapper.eq("wj_index", wjxDjxxTmxx.getWjIndex());
wjxWjxxTmlbQueryWrapper.last("limit 1"); wjxWjxxTmlbQueryWrapper.last("limit 1");
WjxWjxxTmlb tmlb = wjxWjxxTmlbMapper.selectOne(wjxWjxxTmlbQueryWrapper); WjxWjxxTmlb tmlb = wjxWjxxTmlbMapper.selectOne(wjxWjxxTmlbQueryWrapper);
wjxDjxxTmxx.setPicPath(tmlb.getPicPath()); wjxDjxxTmxx.setPicPath(tmlb.getPicPath());
@ -228,43 +229,46 @@ public class WjxDjxxServiceImpl extends ServiceImpl<WjxDjxxMapper, WjxDjxx> impl
} }
baseMapper.addDjTmxx(wjxDjxxTmxx); baseMapper.addDjTmxx(wjxDjxxTmxx);
} }
}else{ } else {
String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString(); String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString();
try { try {
QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<>(); QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<>();
wjxWjxxTmlbQueryWrapper.eq("main_id",wjxxPar.getId()); wjxWjxxTmlbQueryWrapper.eq("main_id", wjxxPar.getId());
wjxWjxxTmlbQueryWrapper.eq("wj_index",wjxDjxxTmxx.getWjIndex()); wjxWjxxTmlbQueryWrapper.eq("wj_index", wjxDjxxTmxx.getWjIndex());
wjxWjxxTmlbQueryWrapper.last("limit 1"); wjxWjxxTmlbQueryWrapper.last("limit 1");
WjxWjxxTmlb tmlb = wjxWjxxTmlbMapper.selectOne(wjxWjxxTmlbQueryWrapper); WjxWjxxTmlb tmlb = wjxWjxxTmlbMapper.selectOne(wjxWjxxTmlbQueryWrapper);
wjxDjxxTmxx.setPicPath(tmlb.getPicPath()); wjxDjxxTmxx.setPicPath(tmlb.getPicPath());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
wjxDjxxTmxx.setId(id);; wjxDjxxTmxx.setId(id);
;
baseMapper.addDjTmxx(wjxDjxxTmxx); baseMapper.addDjTmxx(wjxDjxxTmxx);
} }
}else{ } else {
String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString(); String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString();
try { try {
QueryWrapper<WjxWjxx> wjxWjxxQueryWrapper = new QueryWrapper<>(); QueryWrapper<WjxWjxx> wjxWjxxQueryWrapper = new QueryWrapper<>();
wjxWjxxQueryWrapper.eq("vid",vid); wjxWjxxQueryWrapper.eq("vid", vid);
wjxWjxxQueryWrapper.last("limit 1"); wjxWjxxQueryWrapper.last("limit 1");
WjxWjxx wjxxPar= wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper); WjxWjxx wjxxPar = wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper);
QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<>(); QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<>();
wjxWjxxTmlbQueryWrapper.eq("main_id",wjxxPar.getId()); wjxWjxxTmlbQueryWrapper.eq("main_id", wjxxPar.getId());
wjxWjxxTmlbQueryWrapper.eq("wj_index",wjxDjxxTmxx.getWjIndex()); wjxWjxxTmlbQueryWrapper.eq("wj_index", wjxDjxxTmxx.getWjIndex());
wjxWjxxTmlbQueryWrapper.last("limit 1"); wjxWjxxTmlbQueryWrapper.last("limit 1");
WjxWjxxTmlb tmlb = wjxWjxxTmlbMapper.selectOne(wjxWjxxTmlbQueryWrapper); WjxWjxxTmlb tmlb = wjxWjxxTmlbMapper.selectOne(wjxWjxxTmlbQueryWrapper);
wjxDjxxTmxx.setPicPath(tmlb.getPicPath()); wjxDjxxTmxx.setPicPath(tmlb.getPicPath());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
wjxDjxxTmxx.setId(id);; wjxDjxxTmxx.setId(id);
;
baseMapper.addDjTmxx(wjxDjxxTmxx); baseMapper.addDjTmxx(wjxDjxxTmxx);
} }
} }
}
//修改答卷信息 //修改答卷信息
baseMapper.updateAnswer(wjxDjxx); baseMapper.updateAnswer(wjxDjxx);
} }
@ -461,7 +465,8 @@ public class WjxDjxxServiceImpl extends ServiceImpl<WjxDjxxMapper, WjxDjxx> impl
baseMapper.deleteDjItem(wjxDjxx2); baseMapper.deleteDjItem(wjxDjxx2);
//处理选项 //处理选项
JSONObject answerItemJson = answer.getJSONObject("answer_items"); JSONObject answerItemJson = answer.getJSONObject("answer_items");
for(String key2 : answerItemJson.keySet()){ if(answerItemJson!=null) {
for (String key2 : answerItemJson.keySet()) {
JSONObject answerItem = answerItemJson.getJSONObject(key2); JSONObject answerItem = answerItemJson.getJSONObject(key2);
Integer wjIndex = answerItem.getInteger("q_index"); Integer wjIndex = answerItem.getInteger("q_index");
String wjTitle = answerItem.getString("title"); String wjTitle = answerItem.getString("title");
@ -478,7 +483,7 @@ public class WjxDjxxServiceImpl extends ServiceImpl<WjxDjxxMapper, WjxDjxx> impl
wjxDjxxTmxx.setWjTitle(wjTitle); wjxDjxxTmxx.setWjTitle(wjTitle);
wjxDjxxTmxx.setItemScore(itemScore); wjxDjxxTmxx.setItemScore(itemScore);
wjxDjxxTmxx.setAnswerText(answerText); wjxDjxxTmxx.setAnswerText(answerText);
for(Object index : itemIndex){ for (Object index : itemIndex) {
Integer ti = (Integer) index; Integer ti = (Integer) index;
wjxDjxxTmxx.setItemIndex(ti); wjxDjxxTmxx.setItemIndex(ti);
String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString(); String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString();
@ -486,6 +491,7 @@ public class WjxDjxxServiceImpl extends ServiceImpl<WjxDjxxMapper, WjxDjxx> impl
baseMapper.addDjTmxx(wjxDjxxTmxx); baseMapper.addDjTmxx(wjxDjxxTmxx);
} }
} }
}
//修改答卷信息 //修改答卷信息
baseMapper.updateAnswer(wjxDjxx2); baseMapper.updateAnswer(wjxDjxx2);
} }
@ -739,7 +745,8 @@ public class WjxDjxxServiceImpl extends ServiceImpl<WjxDjxxMapper, WjxDjxx> impl
baseMapper.deleteDjItem(wjxDjxx); baseMapper.deleteDjItem(wjxDjxx);
//处理选项 //处理选项
JSONObject answerItemJson = answer.getJSONObject("answer_items"); JSONObject answerItemJson = answer.getJSONObject("answer_items");
for(String key2 : answerItemJson.keySet()){ if(answerItemJson!=null) {
for (String key2 : answerItemJson.keySet()) {
JSONObject answerItem = answerItemJson.getJSONObject(key2); JSONObject answerItem = answerItemJson.getJSONObject(key2);
WjxDjxxTmxx wjxDjxxTmxx = new WjxDjxxTmxx(); WjxDjxxTmxx wjxDjxxTmxx = new WjxDjxxTmxx();
wjxDjxxTmxx.setVid(answerVid); wjxDjxxTmxx.setVid(answerVid);
@ -748,165 +755,6 @@ public class WjxDjxxServiceImpl extends ServiceImpl<WjxDjxxMapper, WjxDjxx> impl
wjxDjxxTmxx.setCreateBy(wjxDjxx2.getUserId()); wjxDjxxTmxx.setCreateBy(wjxDjxx2.getUserId());
wjxDjxxTmxx.setCreateTime(new Date()); wjxDjxxTmxx.setCreateTime(new Date());
if(answerItem.get("q_index")!=null){
Integer wjIndex = answerItem.getInteger("q_index");
wjxDjxxTmxx.setWjIndex(wjIndex);
}
if(answerItem.get("title")!=null){
String wjTitle = answerItem.getString("title");
wjxDjxxTmxx.setWjTitle(wjTitle);
}
if(answerItem.get("item_value")!=null){
Double itemScore = answerItem.getDouble("item_value");
wjxDjxxTmxx.setItemScore(itemScore);
}
if(answerItem.get("answer_text")!=null){
String answerText = answerItem.getString("answer_text");
wjxDjxxTmxx.setAnswerText(answerText);
}
if(answerItem.get("item_index")!=null){
JSONArray itemIndex = answerItem.getJSONArray("item_index");
QueryWrapper<WjxWjxx> wjxWjxxQueryWrapper = new QueryWrapper<>();
wjxWjxxQueryWrapper.eq("vid",vid);
wjxWjxxQueryWrapper.last("limit 1");
WjxWjxx wjxxPar= wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper);
if(itemIndex.size()>0){
for(Object index : itemIndex){
Integer ti = (Integer) index;
wjxDjxxTmxx.setItemIndex(ti);
String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString();
wjxDjxxTmxx.setId(id);
try {
QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<>();
wjxWjxxTmlbQueryWrapper.eq("main_id",wjxxPar.getId());
wjxWjxxTmlbQueryWrapper.eq("wj_index",wjxDjxxTmxx.getWjIndex());
wjxWjxxTmlbQueryWrapper.last("limit 1");
WjxWjxxTmlb tmlb = wjxWjxxTmlbMapper.selectOne(wjxWjxxTmlbQueryWrapper);
wjxDjxxTmxx.setPicPath(tmlb.getPicPath());
} catch (Exception e) {
e.printStackTrace();
}
baseMapper.addDjTmxx(wjxDjxxTmxx);
}
}else{
String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString();
try {
QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<>();
wjxWjxxTmlbQueryWrapper.eq("main_id",wjxxPar.getId());
wjxWjxxTmlbQueryWrapper.eq("wj_index",wjxDjxxTmxx.getWjIndex());
wjxWjxxTmlbQueryWrapper.last("limit 1");
WjxWjxxTmlb tmlb = wjxWjxxTmlbMapper.selectOne(wjxWjxxTmlbQueryWrapper);
wjxDjxxTmxx.setPicPath(tmlb.getPicPath());
} catch (Exception e) {
e.printStackTrace();
}
wjxDjxxTmxx.setId(id);;
baseMapper.addDjTmxx(wjxDjxxTmxx);
}
}else{
String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString();
try {
QueryWrapper<WjxWjxx> wjxWjxxQueryWrapper = new QueryWrapper<>();
wjxWjxxQueryWrapper.eq("vid",vid);
wjxWjxxQueryWrapper.last("limit 1");
WjxWjxx wjxxPar= wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper);
QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<>();
wjxWjxxTmlbQueryWrapper.eq("main_id",wjxxPar.getId());
wjxWjxxTmlbQueryWrapper.eq("wj_index",wjxDjxxTmxx.getWjIndex());
wjxWjxxTmlbQueryWrapper.last("limit 1");
WjxWjxxTmlb tmlb = wjxWjxxTmlbMapper.selectOne(wjxWjxxTmlbQueryWrapper);
wjxDjxxTmxx.setPicPath(tmlb.getPicPath());
} catch (Exception e) {
e.printStackTrace();
}
wjxDjxxTmxx.setId(id);;
baseMapper.addDjTmxx(wjxDjxxTmxx);
}
}
//修改答卷信息
baseMapper.updateAnswer(wjxDjxx);
}
}else{
baseMapper.updateErrMsg(wjxDjxx2.getUserId(),vid,ansJsonResult.getString("errormsg"));
return ansJsonResult.getString("errormsg");
}
}
}else{
baseMapper.updateErrMsg(wjxDjxx2.getUserId(),vid,jsonResult.getString("errormsg"));
return jsonResult.getString("errormsg");
}
}
try {
if(StringUtils.isNotBlank(jidRes)){
jsscore(jidRes);
}
}catch (Exception e){
e.printStackTrace();
}
return "提交成功！";
}
@Override
public String getDjjg(WjxDjxx wjxDjxxPar) {
// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String vid = wjxDjxxPar.getVid();
if(vid ==null || vid.equals("")){
return "此试卷错误，无法提交！";
}
//调用接口,提交
String jidRes = wjxDjxxPar.getJid();
//调用接口，答卷查询
Map<String,Object> selMap = new HashMap<>();
selMap.put("vid",Integer.valueOf(vid));
selMap.put("jid",Long.valueOf(jidRes));
//调用接口,查询答卷结果
String answerStr = wjxUtil.openapi(selMap,"1001002");
if(!answerStr.equals("")) {
JSONObject ansJsonResult = JSONObject.parseObject(answerStr);
if (ansJsonResult.getBoolean("result")) {
JSONObject ansDataJson = ansJsonResult.getJSONObject("data");
String answerVid = ansDataJson.getString("vid");
JSONObject answerJsonArray = ansDataJson.getJSONObject("answers");
for (String key1 : answerJsonArray.keySet()) {
JSONObject answer = answerJsonArray.getJSONObject(key1);
String jidAns = answer.getString("jid");
Integer answerSeconds = answer.getInteger("answer_seconds");
Double score = answer.getDouble("score");
Double totalScore = answer.getDouble("total_score");
WjxDjxx wjxDjxx = new WjxDjxx();
wjxDjxx.setVid(answerVid);
wjxDjxx.setJid(jidAns);
wjxDjxx.setAnswerSeconds(answerSeconds);
wjxDjxx.setScore(score);
wjxDjxx.setTotalScore(totalScore);
//删除选项信息
baseMapper.deleteDjItem(wjxDjxx);
//处理选项
JSONObject answerItemJson = answer.getJSONObject("answer_items");
for (String key2 : answerItemJson.keySet()) {
JSONObject answerItem = answerItemJson.getJSONObject(key2);
WjxDjxxTmxx wjxDjxxTmxx = new WjxDjxxTmxx();
wjxDjxxTmxx.setVid(answerVid);
wjxDjxxTmxx.setJid(jidAns);
wjxDjxxTmxx.setUserId(wjxDjxxPar.getUserId());
wjxDjxxTmxx.setCreateBy(wjxDjxxPar.getUserId());
wjxDjxxTmxx.setCreateTime(new Date());
if (answerItem.get("q_index") != null) { if (answerItem.get("q_index") != null) {
Integer wjIndex = answerItem.getInteger("q_index"); Integer wjIndex = answerItem.getInteger("q_index");
wjxDjxxTmxx.setWjIndex(wjIndex); wjxDjxxTmxx.setWjIndex(wjIndex);
@ -993,6 +841,180 @@ public class WjxDjxxServiceImpl extends ServiceImpl<WjxDjxxMapper, WjxDjxx> impl
baseMapper.addDjTmxx(wjxDjxxTmxx); baseMapper.addDjTmxx(wjxDjxxTmxx);
} }
} }
}
//修改答卷信息
baseMapper.updateAnswer(wjxDjxx);
}
}else{
baseMapper.updateErrMsg(wjxDjxx2.getUserId(),vid,ansJsonResult.getString("errormsg"));
return ansJsonResult.getString("errormsg");
}
}
}else{
baseMapper.updateErrMsg(wjxDjxx2.getUserId(),vid,jsonResult.getString("errormsg"));
return jsonResult.getString("errormsg");
}
}
try {
if(StringUtils.isNotBlank(jidRes)){
jsscore(jidRes);
}
}catch (Exception e){
e.printStackTrace();
}
return "提交成功！";
}
@Override
public String getDjjg(WjxDjxx wjxDjxxPar) {
// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String vid = wjxDjxxPar.getVid();
if(vid ==null || vid.equals("")){
return "此试卷错误，无法提交！";
}
//调用接口,提交
String jidRes = wjxDjxxPar.getJid();
//调用接口，答卷查询
Map<String,Object> selMap = new HashMap<>();
selMap.put("vid",Integer.valueOf(vid));
selMap.put("jid",Long.valueOf(jidRes));
//调用接口,查询答卷结果
String answerStr = wjxUtil.openapi(selMap,"1001002");
if(!answerStr.equals("")) {
JSONObject ansJsonResult = JSONObject.parseObject(answerStr);
if (ansJsonResult.getBoolean("result")) {
JSONObject ansDataJson = ansJsonResult.getJSONObject("data");
String answerVid = ansDataJson.getString("vid");
JSONObject answerJsonArray = ansDataJson.getJSONObject("answers");
for (String key1 : answerJsonArray.keySet()) {
JSONObject answer = answerJsonArray.getJSONObject(key1);
String jidAns = answer.getString("jid");
Integer answerSeconds = answer.getInteger("answer_seconds");
Double score = answer.getDouble("score");
Double totalScore = answer.getDouble("total_score");
WjxDjxx wjxDjxx = new WjxDjxx();
wjxDjxx.setVid(answerVid);
wjxDjxx.setJid(jidAns);
wjxDjxx.setAnswerSeconds(answerSeconds);
wjxDjxx.setScore(score);
wjxDjxx.setTotalScore(totalScore);
//删除选项信息
// baseMapper.deleteDjItem(wjxDjxx);
//处理选项
JSONObject answerItemJson = answer.getJSONObject("answer_items");
if(answerItemJson!=null){
for (String key2 : answerItemJson.keySet()) {
JSONObject answerItem = answerItemJson.getJSONObject(key2);
WjxDjxxTmxx wjxDjxxTmxx = new WjxDjxxTmxx();
wjxDjxxTmxx.setVid(answerVid);
wjxDjxxTmxx.setJid(jidAns);
wjxDjxxTmxx.setUserId(wjxDjxxPar.getUserId());
wjxDjxxTmxx.setCreateBy(wjxDjxxPar.getUserId());
wjxDjxxTmxx.setCreateTime(new Date());
if (answerItem.get("q_index") != null) {
Integer wjIndex = answerItem.getInteger("q_index");
wjxDjxxTmxx.setWjIndex(wjIndex);
}
if (answerItem.get("title") != null) {
String wjTitle = answerItem.getString("title");
wjxDjxxTmxx.setWjTitle(wjTitle);
}
if (answerItem.get("item_value") != null) {
Double itemScore = answerItem.getDouble("item_value");
wjxDjxxTmxx.setItemScore(itemScore);
}
if (answerItem.get("answer_text") != null) {
String answerText = answerItem.getString("answer_text");
wjxDjxxTmxx.setAnswerText(answerText);
}
if (answerItem.get("item_index") != null) {
JSONArray itemIndex = answerItem.getJSONArray("item_index");
QueryWrapper<WjxWjxx> wjxWjxxQueryWrapper = new QueryWrapper<>();
wjxWjxxQueryWrapper.eq("vid", vid);
wjxWjxxQueryWrapper.last("limit 1");
WjxWjxx wjxxPar = wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper);
if (itemIndex.size() > 0) {
for (Object index : itemIndex) {
Integer ti = (Integer) index;
wjxDjxxTmxx.setItemIndex(ti);
String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString();
wjxDjxxTmxx.setId(id);
try {
QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<>();
wjxWjxxTmlbQueryWrapper.eq("main_id", wjxxPar.getId());
wjxWjxxTmlbQueryWrapper.eq("wj_index", wjxDjxxTmxx.getWjIndex());
wjxWjxxTmlbQueryWrapper.last("limit 1");
WjxWjxxTmlb tmlb = wjxWjxxTmlbMapper.selectOne(wjxWjxxTmlbQueryWrapper);
wjxDjxxTmxx.setPicPath(tmlb.getPicPath());
} catch (Exception e) {
e.printStackTrace();
}
WjxDjxxTmxx djxxTmxx = baseMapper.getSfysj(wjxDjxxTmxx);
if(djxxTmxx==null){
baseMapper.addDjTmxx(wjxDjxxTmxx);
}
}
} else {
String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString();
try {
QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<>();
wjxWjxxTmlbQueryWrapper.eq("main_id", wjxxPar.getId());
wjxWjxxTmlbQueryWrapper.eq("wj_index", wjxDjxxTmxx.getWjIndex());
wjxWjxxTmlbQueryWrapper.last("limit 1");
WjxWjxxTmlb tmlb = wjxWjxxTmlbMapper.selectOne(wjxWjxxTmlbQueryWrapper);
wjxDjxxTmxx.setPicPath(tmlb.getPicPath());
} catch (Exception e) {
e.printStackTrace();
}
wjxDjxxTmxx.setId(id);
WjxDjxxTmxx djxxTmxx = baseMapper.getSfysj(wjxDjxxTmxx);
if(djxxTmxx==null){
baseMapper.addDjTmxx(wjxDjxxTmxx);
}
}
} else {
String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString();
try {
QueryWrapper<WjxWjxx> wjxWjxxQueryWrapper = new QueryWrapper<>();
wjxWjxxQueryWrapper.eq("vid", vid);
wjxWjxxQueryWrapper.last("limit 1");
WjxWjxx wjxxPar = wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper);
QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<>();
wjxWjxxTmlbQueryWrapper.eq("main_id", wjxxPar.getId());
wjxWjxxTmlbQueryWrapper.eq("wj_index", wjxDjxxTmxx.getWjIndex());
wjxWjxxTmlbQueryWrapper.last("limit 1");
WjxWjxxTmlb tmlb = wjxWjxxTmlbMapper.selectOne(wjxWjxxTmlbQueryWrapper);
wjxDjxxTmxx.setPicPath(tmlb.getPicPath());
} catch (Exception e) {
e.printStackTrace();
}
wjxDjxxTmxx.setId(id);
WjxDjxxTmxx djxxTmxx = baseMapper.getSfysj(wjxDjxxTmxx);
if(djxxTmxx==null){
baseMapper.addDjTmxx(wjxDjxxTmxx);
}
}
}
}
//修改答卷信息 //修改答卷信息
baseMapper.updateAnswer(wjxDjxx); baseMapper.updateAnswer(wjxDjxx);
} }
@ -1012,7 +1034,7 @@ public class WjxDjxxServiceImpl extends ServiceImpl<WjxDjxxMapper, WjxDjxx> impl
return "提交成功！"; return "获取成功！";
} }
public void jsscore(String jid){ public void jsscore(String jid){

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java
View File

@ -268,7 +268,7 @@ public class WjxWjxxServiceImpl extends ServiceImpl<WjxWjxxMapper, WjxWjxx> impl
if(wWjxWjxxTmlb.getWjScore()!=null){ if(wWjxWjxxTmlb.getWjScore()!=null){
map.put("q_score",wWjxWjxxTmlb.getWjScore()); map.put("q_score",wWjxWjxxTmlb.getWjScore());
} }
map.put("is_requir",true); map.put("is_requir",false);
map.put("q_ceshi",true); map.put("q_ceshi",true);
map.put("is_toupiao",3); map.put("is_toupiao",3);
}else{ }else{