From 7eadfc2b0e0151160699a524f307987fe6c7a28d Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 15 Nov 2024 17:35:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5=E8=AF=95?= =?UTF-8?q?=E9=A2=98=E6=8E=92=E9=99=A4=E7=A9=BA=E7=9A=84=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WjxWjxxTmlbController.java | 150 +++++++++--------- .../src/main/resources/application-dev.yml | 12 +- .../src/main/resources/application-prod.yml | 8 +- .../src/main/resources/application.yml | 3 +- 4 files changed, 94 insertions(+), 79 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java index 2333d383..acb2238a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java @@ -470,84 +470,86 @@ public class WjxWjxxTmlbController extends JeecgController 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 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 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()); diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index a0fb9d91..85a7955b 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -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: diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml index 39355c0f..f817dafa 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml @@ -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 diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application.yml index 67562f19..1ad7c0b0 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application.yml @@ -2,4 +2,5 @@ spring: application: name: jeecg-system profiles: - active: '@profile.name@' \ No newline at end of file + #active: '@profile.name@' + active: dev \ No newline at end of file