From 91e21dd8f60baa27c29e6cd2535adc5b46e7de28 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 27 Nov 2024 14:33:43 +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 --- .../java/org/jeecg/common/util/SFTPUtil.java | 8 +- .../org/jeecg/config/shiro/ShiroConfig.java | 1 + .../SynchronizationService/SyncZyCcjg.java | 11 - .../SynchronizationService/SyncZyCyFbxx.java | 64 +++ .../kc/wjxDjxx/mapper/WjxDjxxMapper.java | 2 + .../kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml | 6 + .../service/impl/WjxDjxxServiceImpl.java | 428 +++++++++--------- .../service/impl/WjxWjxxServiceImpl.java | 2 +- 8 files changed, 303 insertions(+), 219 deletions(-) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZyCyFbxx.java diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SFTPUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SFTPUtil.java index b47feaa8..18be395b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SFTPUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SFTPUtil.java @@ -64,10 +64,10 @@ public class SFTPUtil { channel.connect(); sftp = (ChannelSftp) channel; logger.info("登录成功"); - }else{ - Channel channel = sshSession.openChannel("sftp"); - channel.connect(); - sftp = (ChannelSftp) channel; +// }else{ +// Channel channel = sshSession.openChannel("sftp"); +// channel.connect(); +// sftp = (ChannelSftp) channel; } } catch (Exception e){ try{ diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 819f1348..825b984b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -98,6 +98,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/wxpay/**", "anon");//微信接口 filterChainDefinitionMap.put("/temp/**", "anon");//微信接口 filterChainDefinitionMap.put("/kczx/**", "anon");//微信接口 + filterChainDefinitionMap.put("/v3/3rd/**", "anon");//wps接口 filterChainDefinitionMap.put("/sys/getLoginQrcode/**", "anon"); //登录二维码 filterChainDefinitionMap.put("/sys/getQrcodeToken/**", "anon"); //监听扫码 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZyCcjg.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZyCcjg.java index c4642219..ddb9e734 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZyCcjg.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZyCcjg.java @@ -46,17 +46,6 @@ public class SyncZyCcjg extends BaseSync { } catch (Exception e) { e.printStackTrace(); } - try { - zyInfoService.updateInfoZyStatus(); - } catch (Exception e) { - e.printStackTrace(); - } - - try { - wjxWjxxService.updateCeyanStatus(); - } catch (Exception e) { - e.printStackTrace(); - } } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZyCyFbxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZyCyFbxx.java new file mode 100644 index 00000000..4348f7fc --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZyCyFbxx.java @@ -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 param){ + try { + zyInfoService.updateInfoZyStatus(); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + wjxWjxxService.updateCeyanStatus(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 无参定时任务实现 + */ + public void run(){ + run(null); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java index bd454e6c..30c71032 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java @@ -65,4 +65,6 @@ public interface WjxDjxxMapper extends BaseMapper { void updateScoreByJid(WjxDjxx par2); WjxDjxx getInfoByVidUser(WjxDjxx wjxDjxx); + + WjxDjxxTmxx getSfysj( @Param("wjxDjxxTmxx")WjxDjxxTmxx wjxDjxxTmxx); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml index bb3583f4..4a19ad3c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml @@ -74,6 +74,7 @@ delete from wjx_djxx_tmxx where vid = #{vid} and jid = #{jid} + and item_score is not null @@ -429,4 +430,9 @@ set score = #{score} where jid = #{jid} + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java index 091918ae..efd2c456 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java @@ -172,97 +172,101 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl 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(user.getUsername()); - wjxDjxxTmxx.setCreateBy(user.getUsername()); - wjxDjxxTmxx.setCreateTime(new Date()); + 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(user.getUsername()); + wjxDjxxTmxx.setCreateBy(user.getUsername()); + 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("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"); + 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 wjxWjxxQueryWrapper = new QueryWrapper<>(); - wjxWjxxQueryWrapper.eq("vid",vid); - wjxWjxxQueryWrapper.last("limit 1"); - WjxWjxx wjxxPar= wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper); + QueryWrapper 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; + if (itemIndex.size() > 0) { + for (Object index : itemIndex) { + Integer ti = (Integer) index; - wjxDjxxTmxx.setItemIndex(ti); + wjxDjxxTmxx.setItemIndex(ti); + String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString(); + wjxDjxxTmxx.setId(id); + + try { + QueryWrapper 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(); - wjxDjxxTmxx.setId(id); try { QueryWrapper wjxWjxxTmlbQueryWrapper = new QueryWrapper<>(); - wjxWjxxTmlbQueryWrapper.eq("main_id",wjxxPar.getId()); - wjxWjxxTmlbQueryWrapper.eq("wj_index",wjxDjxxTmxx.getWjIndex()); + 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{ + } else { String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString(); try { + QueryWrapper wjxWjxxQueryWrapper = new QueryWrapper<>(); + wjxWjxxQueryWrapper.eq("vid", vid); + wjxWjxxQueryWrapper.last("limit 1"); + WjxWjxx wjxxPar = wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper); QueryWrapper wjxWjxxTmlbQueryWrapper = new QueryWrapper<>(); - wjxWjxxTmlbQueryWrapper.eq("main_id",wjxxPar.getId()); - wjxWjxxTmlbQueryWrapper.eq("wj_index",wjxDjxxTmxx.getWjIndex()); + 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.setId(id); + ; baseMapper.addDjTmxx(wjxDjxxTmxx); } - }else{ - String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString(); - - try { - QueryWrapper wjxWjxxQueryWrapper = new QueryWrapper<>(); - wjxWjxxQueryWrapper.eq("vid",vid); - wjxWjxxQueryWrapper.last("limit 1"); - WjxWjxx wjxxPar= wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper); - QueryWrapper 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); } } //修改答卷信息 @@ -461,29 +465,31 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl baseMapper.deleteDjItem(wjxDjxx2); //处理选项 JSONObject answerItemJson = answer.getJSONObject("answer_items"); - for(String key2 : answerItemJson.keySet()){ - JSONObject answerItem = answerItemJson.getJSONObject(key2); - Integer wjIndex = answerItem.getInteger("q_index"); - String wjTitle = answerItem.getString("title"); - JSONArray itemIndex = answerItem.getJSONArray("item_index"); - Double itemScore = answerItem.getDouble("item_value"); - String answerText = answerItem.getString("answer_text"); - WjxDjxxTmxx wjxDjxxTmxx = new WjxDjxxTmxx(); - wjxDjxxTmxx.setVid(answerVid); - wjxDjxxTmxx.setJid(jidAns); - wjxDjxxTmxx.setUserId(userId); - wjxDjxxTmxx.setCreateBy(userId); - wjxDjxxTmxx.setCreateTime(new Date()); - wjxDjxxTmxx.setWjIndex(wjIndex); - wjxDjxxTmxx.setWjTitle(wjTitle); - wjxDjxxTmxx.setItemScore(itemScore); - wjxDjxxTmxx.setAnswerText(answerText); - for(Object index : itemIndex){ - Integer ti = (Integer) index; - wjxDjxxTmxx.setItemIndex(ti); - String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString(); - wjxDjxxTmxx.setId(id); - baseMapper.addDjTmxx(wjxDjxxTmxx); + if(answerItemJson!=null) { + for (String key2 : answerItemJson.keySet()) { + JSONObject answerItem = answerItemJson.getJSONObject(key2); + Integer wjIndex = answerItem.getInteger("q_index"); + String wjTitle = answerItem.getString("title"); + JSONArray itemIndex = answerItem.getJSONArray("item_index"); + Double itemScore = answerItem.getDouble("item_value"); + String answerText = answerItem.getString("answer_text"); + WjxDjxxTmxx wjxDjxxTmxx = new WjxDjxxTmxx(); + wjxDjxxTmxx.setVid(answerVid); + wjxDjxxTmxx.setJid(jidAns); + wjxDjxxTmxx.setUserId(userId); + wjxDjxxTmxx.setCreateBy(userId); + wjxDjxxTmxx.setCreateTime(new Date()); + wjxDjxxTmxx.setWjIndex(wjIndex); + wjxDjxxTmxx.setWjTitle(wjTitle); + wjxDjxxTmxx.setItemScore(itemScore); + wjxDjxxTmxx.setAnswerText(answerText); + for (Object index : itemIndex) { + Integer ti = (Integer) index; + wjxDjxxTmxx.setItemIndex(ti); + String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString(); + wjxDjxxTmxx.setId(id); + baseMapper.addDjTmxx(wjxDjxxTmxx); + } } } //修改答卷信息 @@ -739,97 +745,101 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl 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(wjxDjxx2.getUserId()); - wjxDjxxTmxx.setCreateBy(wjxDjxx2.getUserId()); - wjxDjxxTmxx.setCreateTime(new Date()); + 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(wjxDjxx2.getUserId()); + wjxDjxxTmxx.setCreateBy(wjxDjxx2.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("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"); + 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 wjxWjxxQueryWrapper = new QueryWrapper<>(); - wjxWjxxQueryWrapper.eq("vid",vid); - wjxWjxxQueryWrapper.last("limit 1"); - WjxWjxx wjxxPar= wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper); + QueryWrapper 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; + if (itemIndex.size() > 0) { + for (Object index : itemIndex) { + Integer ti = (Integer) index; - wjxDjxxTmxx.setItemIndex(ti); + wjxDjxxTmxx.setItemIndex(ti); + String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString(); + wjxDjxxTmxx.setId(id); + + try { + QueryWrapper 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(); - wjxDjxxTmxx.setId(id); try { QueryWrapper wjxWjxxTmlbQueryWrapper = new QueryWrapper<>(); - wjxWjxxTmlbQueryWrapper.eq("main_id",wjxxPar.getId()); - wjxWjxxTmlbQueryWrapper.eq("wj_index",wjxDjxxTmxx.getWjIndex()); + 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{ + } else { String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString(); try { + QueryWrapper wjxWjxxQueryWrapper = new QueryWrapper<>(); + wjxWjxxQueryWrapper.eq("vid", vid); + wjxWjxxQueryWrapper.last("limit 1"); + WjxWjxx wjxxPar = wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper); QueryWrapper wjxWjxxTmlbQueryWrapper = new QueryWrapper<>(); - wjxWjxxTmlbQueryWrapper.eq("main_id",wjxxPar.getId()); - wjxWjxxTmlbQueryWrapper.eq("wj_index",wjxDjxxTmxx.getWjIndex()); + 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.setId(id); + ; baseMapper.addDjTmxx(wjxDjxxTmxx); } - }else{ - String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString(); - - try { - QueryWrapper wjxWjxxQueryWrapper = new QueryWrapper<>(); - wjxWjxxQueryWrapper.eq("vid",vid); - wjxWjxxQueryWrapper.last("limit 1"); - WjxWjxx wjxxPar= wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper); - QueryWrapper 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); } } //修改答卷信息 @@ -895,52 +905,73 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl wjxDjxx.setScore(score); wjxDjxx.setTotalScore(totalScore); //删除选项信息 - baseMapper.deleteDjItem(wjxDjxx); +// 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(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("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"); + 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 wjxWjxxQueryWrapper = new QueryWrapper<>(); - wjxWjxxQueryWrapper.eq("vid", vid); - wjxWjxxQueryWrapper.last("limit 1"); - WjxWjxx wjxxPar = wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper); + QueryWrapper 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; + if (itemIndex.size() > 0) { + for (Object index : itemIndex) { + Integer ti = (Integer) index; - wjxDjxxTmxx.setItemIndex(ti); + wjxDjxxTmxx.setItemIndex(ti); + String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString(); + wjxDjxxTmxx.setId(id); + + try { + QueryWrapper 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(); - wjxDjxxTmxx.setId(id); try { QueryWrapper wjxWjxxTmlbQueryWrapper = new QueryWrapper<>(); @@ -952,12 +983,20 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl } catch (Exception e) { e.printStackTrace(); } - baseMapper.addDjTmxx(wjxDjxxTmxx); + 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 wjxWjxxQueryWrapper = new QueryWrapper<>(); + wjxWjxxQueryWrapper.eq("vid", vid); + wjxWjxxQueryWrapper.last("limit 1"); + WjxWjxx wjxxPar = wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper); QueryWrapper wjxWjxxTmlbQueryWrapper = new QueryWrapper<>(); wjxWjxxTmlbQueryWrapper.eq("main_id", wjxxPar.getId()); wjxWjxxTmlbQueryWrapper.eq("wj_index", wjxDjxxTmxx.getWjIndex()); @@ -968,31 +1007,14 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl e.printStackTrace(); } wjxDjxxTmxx.setId(id); - ; - baseMapper.addDjTmxx(wjxDjxxTmxx); + WjxDjxxTmxx djxxTmxx = baseMapper.getSfysj(wjxDjxxTmxx); + if(djxxTmxx==null){ + baseMapper.addDjTmxx(wjxDjxxTmxx); + } } - } else { - String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString(); - - try { - QueryWrapper wjxWjxxQueryWrapper = new QueryWrapper<>(); - wjxWjxxQueryWrapper.eq("vid", vid); - wjxWjxxQueryWrapper.last("limit 1"); - WjxWjxx wjxxPar = wjxWjxxMapper.selectOne(wjxWjxxQueryWrapper); - QueryWrapper 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); } @@ -1012,7 +1034,7 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl - return "提交成功！"; + return "获取成功！"; } public void jsscore(String jid){ 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 12f927f8..90335242 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 @@ -268,7 +268,7 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl if(wWjxWjxxTmlb.getWjScore()!=null){ map.put("q_score",wWjxWjxxTmlb.getWjScore()); } - map.put("is_requir",true); + map.put("is_requir",false); map.put("q_ceshi",true); map.put("is_toupiao",3); }else{