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

添加导入试题排除空的选项

This commit is contained in:
yangjun 2024-11-15 17:35:54 +08:00
parent ee3971b6ce
commit 7eadfc2b0e
4 changed files with 94 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java
View File

@ -470,84 +470,86 @@ public class WjxWjxxTmlbController extends JeecgController<WjxWjxxTmlb, IWjxWjxx
List<WjxWjxxImportPage> list = ExcelImportUtil.importExcel(file.getInputStream(), WjxWjxxImportPage.class, params);
int i=0;
for (WjxWjxxImportPage page : list) {
i = i+1;
WjxWjxxTmlb po = new WjxWjxxTmlb();
po.setWjLeixing("6");
po.setWjTitle(page.getWjTitle());
po.setWjType(page.getWjType());
po.setWjIndex(i);
po.setWjScore(page.getWjScore());
if(StringUtils.isNotBlank(mainId)){
po.setMainId(mainId);
}
List<WjxWjxxTmxx> wjxWjxxTmxxList = new ArrayList<>();
if(StringUtils.equals(page.getWjType()+"","5")){
String ansA = page.getWjAnswer();
po.setWjAnswer(ansA);
}else{
String ansA = page.getAnsA();
String ansB = page.getAnsB();
String ansC = page.getAnsC();
String ansD = page.getAnsD();
String ansE = page.getAnsE();
String ansF = page.getAnsF();
String wjAnswer = page.getWjAnswer();//正确答案
if(StringUtils.isNotBlank(ansA)){
WjxWjxxTmxx wjxWjxxTmxx = new WjxWjxxTmxx();
wjxWjxxTmxx.setWjIndex(po.getWjIndex());
wjxWjxxTmxx.setItemIndex(1);
wjxWjxxTmxx.setItemTitle(ansA);
if(StringUtils.equals(page.getWjType()+"","3")){
wjxWjxxTmxx.setItemSelected(wjAnswer.indexOf("A")>-1?"true":"false");
}else{
wjxWjxxTmxx.setItemSelected(wjAnswer.indexOf("A")>-1?"true":"false");
if(StringUtils.isNotBlank(page.getWjTitle())){
i = i+1;
WjxWjxxTmlb po = new WjxWjxxTmlb();
po.setWjLeixing("6");
po.setWjTitle(page.getWjTitle());
po.setWjType(page.getWjType());
po.setWjIndex(i);
po.setWjScore(page.getWjScore());
if(StringUtils.isNotBlank(mainId)){
po.setMainId(mainId);
}
List<WjxWjxxTmxx> wjxWjxxTmxxList = new ArrayList<>();
if(StringUtils.equals(page.getWjType()+"","5")){
String ansA = page.getWjAnswer();
po.setWjAnswer(ansA);
}else{
String ansA = page.getAnsA();
String ansB = page.getAnsB();
String ansC = page.getAnsC();
String ansD = page.getAnsD();
String ansE = page.getAnsE();
String ansF = page.getAnsF();
String wjAnswer = page.getWjAnswer();//正确答案
if(StringUtils.isNotBlank(ansA)){
WjxWjxxTmxx wjxWjxxTmxx = new WjxWjxxTmxx();
wjxWjxxTmxx.setWjIndex(po.getWjIndex());
wjxWjxxTmxx.setItemIndex(1);
wjxWjxxTmxx.setItemTitle(ansA);
if(StringUtils.equals(page.getWjType()+"","3")){
wjxWjxxTmxx.setItemSelected(wjAnswer.indexOf("A")>-1?"true":"false");
}else{
wjxWjxxTmxx.setItemSelected(wjAnswer.indexOf("A")>-1?"true":"false");
}
wjxWjxxTmxxList.add(wjxWjxxTmxx);
}
if(StringUtils.isNotBlank(ansB)){
WjxWjxxTmxx wjxWjxxTmxx = new WjxWjxxTmxx();
wjxWjxxTmxx.setWjIndex(po.getWjIndex());
wjxWjxxTmxx.setItemIndex(2);
wjxWjxxTmxx.setItemTitle(ansB);
wjxWjxxTmxx.setItemSelected(wjAnswer.indexOf("B")>-1?"true":"false");
wjxWjxxTmxxList.add(wjxWjxxTmxx);
}
if(StringUtils.isNotBlank(ansC)){
WjxWjxxTmxx wjxWjxxTmxx = new WjxWjxxTmxx();
wjxWjxxTmxx.setWjIndex(po.getWjIndex());
wjxWjxxTmxx.setItemIndex(3);
wjxWjxxTmxx.setItemTitle(ansC);
wjxWjxxTmxx.setItemSelected(wjAnswer.indexOf("C")>-1?"true":"false");
wjxWjxxTmxxList.add(wjxWjxxTmxx);
}
if(StringUtils.isNotBlank(ansD)){
WjxWjxxTmxx wjxWjxxTmxx = new WjxWjxxTmxx();
wjxWjxxTmxx.setWjIndex(po.getWjIndex());
wjxWjxxTmxx.setItemIndex(4);
wjxWjxxTmxx.setItemTitle(ansD);
wjxWjxxTmxx.setItemSelected(wjAnswer.indexOf("D")>-1?"true":"false");
wjxWjxxTmxxList.add(wjxWjxxTmxx);
}
if(StringUtils.isNotBlank(ansE)){
WjxWjxxTmxx wjxWjxxTmxx = new WjxWjxxTmxx();
wjxWjxxTmxx.setWjIndex(po.getWjIndex());
wjxWjxxTmxx.setItemIndex(5);
wjxWjxxTmxx.setItemTitle(ansE);
wjxWjxxTmxx.setItemSelected(wjAnswer.indexOf("E")>-1?"true":"false");
wjxWjxxTmxxList.add(wjxWjxxTmxx);
}
if(StringUtils.isNotBlank(ansF)){
WjxWjxxTmxx wjxWjxxTmxx = new WjxWjxxTmxx();
wjxWjxxTmxx.setWjIndex(po.getWjIndex());
wjxWjxxTmxx.setItemIndex(6);
wjxWjxxTmxx.setItemTitle(ansF);
wjxWjxxTmxx.setItemSelected(wjAnswer.indexOf("F")>-1?"true":"false");
wjxWjxxTmxxList.add(wjxWjxxTmxx);
}
wjxWjxxTmxxList.add(wjxWjxxTmxx);
}
if(StringUtils.isNotBlank(ansB)){
WjxWjxxTmxx wjxWjxxTmxx = new WjxWjxxTmxx();
wjxWjxxTmxx.setWjIndex(po.getWjIndex());
wjxWjxxTmxx.setItemIndex(2);
wjxWjxxTmxx.setItemTitle(ansB);
wjxWjxxTmxx.setItemSelected(wjAnswer.indexOf("B")>-1?"true":"false");
wjxWjxxTmxxList.add(wjxWjxxTmxx);
}
if(StringUtils.isNotBlank(ansC)){
WjxWjxxTmxx wjxWjxxTmxx = new WjxWjxxTmxx();
wjxWjxxTmxx.setWjIndex(po.getWjIndex());
wjxWjxxTmxx.setItemIndex(3);
wjxWjxxTmxx.setItemTitle(ansC);
wjxWjxxTmxx.setItemSelected(wjAnswer.indexOf("C")>-1?"true":"false");
wjxWjxxTmxxList.add(wjxWjxxTmxx);
}
if(StringUtils.isNotBlank(ansD)){
WjxWjxxTmxx wjxWjxxTmxx = new WjxWjxxTmxx();
wjxWjxxTmxx.setWjIndex(po.getWjIndex());
wjxWjxxTmxx.setItemIndex(4);
wjxWjxxTmxx.setItemTitle(ansD);
wjxWjxxTmxx.setItemSelected(wjAnswer.indexOf("D")>-1?"true":"false");
wjxWjxxTmxxList.add(wjxWjxxTmxx);
}
if(StringUtils.isNotBlank(ansE)){
WjxWjxxTmxx wjxWjxxTmxx = new WjxWjxxTmxx();
wjxWjxxTmxx.setWjIndex(po.getWjIndex());
wjxWjxxTmxx.setItemIndex(5);
wjxWjxxTmxx.setItemTitle(ansE);
wjxWjxxTmxx.setItemSelected(wjAnswer.indexOf("E")>-1?"true":"false");
wjxWjxxTmxxList.add(wjxWjxxTmxx);
}
if(StringUtils.isNotBlank(ansF)){
WjxWjxxTmxx wjxWjxxTmxx = new WjxWjxxTmxx();
wjxWjxxTmxx.setWjIndex(po.getWjIndex());
wjxWjxxTmxx.setItemIndex(6);
wjxWjxxTmxx.setItemTitle(ansF);
wjxWjxxTmxx.setItemSelected(wjAnswer.indexOf("F")>-1?"true":"false");
wjxWjxxTmxxList.add(wjxWjxxTmxx);
}
wjxWjxxTmlbService.saveMain(po, wjxWjxxTmxxList);
}
wjxWjxxTmlbService.saveMain(po, wjxWjxxTmxxList);
}
return Result.OK("文件导入成功！数据行数:" + list.size());
return Result.OK("文件导入成功！数据行数:" + i);
} catch (Exception e) {
log.error(e.getMessage(),e);
return Result.error("文件导入失败:"+e.getMessage());

12
jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
View File

@ -141,9 +141,15 @@ spring:
driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置
# multi-oracle:
# url: jdbc:oracle:thin:@//192.168.2.185:1521/BLXC
# username: test7788
# password: test7788
# url: jdbc:oracle:thin:@//192.168.2.14:1521/orcl
# username: kczx
# password: kczx
# driver-class-name: oracle.jdbc.OracleDriver
# multi-oracle:
# url: jdbc:oracle:thin:@192.168.2.14:1521:orcl?useUnicode=true&characterEncoding=utf8
# username: kczx
# password: kczx
# driver-class-name: oracle.jdbc.OracleDriver
#redis 配置
redis:

8
jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml
View File

@ -137,8 +137,14 @@ spring:
# password: root
driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置
# multi-oracle:
# url: jdbc:oracle:thin:@202.198.129.24:1521:orcl?useUnicode=true&characterEncoding=utf8
# username: C##XSKC
# password: mAPP2t2ABAfx7
# driver-class-name: oracle.jdbc.OracleDriver
multi-oracle:
url: jdbc:oracle:thin:@202.198.129.24:1521:orcl
url: jdbc:oracle:thin:@//202.198.129.24:1521/orcl
username: C##XSKC
password: mAPP2t2ABAfx7
driver-class-name: oracle.jdbc.OracleDriver

3
jeecg-module-system/jeecg-system-start/src/main/resources/application.yml
View File

@ -2,4 +2,5 @@ spring:
application:
name: jeecg-system
profiles:
active: '@profile.name@'
#active: '@profile.name@'
active: dev