From a5ad8077d47089114c3510beb2b1902550f005e6 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 25 Aug 2021 14:24:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 81ee5c0f..3261df90 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -126,6 +126,7 @@ public class ScheduledJob { //持久化至预警表 忽略标准id和标志位都一样的数据 if (warningList.size()!=0){ + //此表的STAND_CODE和MARK字段需建立唯一性约束 int count = sarStandardWarningDao.ignoreInsert(warningList); System.out.println("已预警 " + count + " 条标准或条款!!"); } From 71aba6aa2d8eeb6f18e977e92b01f60e62248e82 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 25 Aug 2021 17:20:45 +0800 Subject: [PATCH 2/3] feat: There is no way the --- .../adc/da/ocr/service/impl/OCRRestfulServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java index 624baec3..5f073609 100644 --- a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java @@ -164,8 +164,8 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { saveWordFileName=UUIDUtils.randomUUID20()+"_"+wordFile.getOriginalFilename(); saveWordFilePath=ocrFilePath+saveWordFileName; logger.info(saveWordFilePath); - //FileUtils.copyInputStreamToFile(wordFile.getInputStream(),new File(saveWordFilePath)); - savePic(wordFile.getInputStream(),saveWordFilePath); + FileUtils.copyInputStreamToFile(wordFile.getInputStream(),new File(saveWordFilePath)); +// savePic(wordFile.getInputStream(),saveWordFilePath); logger.info("word存储完成"); } String saveJsonFilePath=null; @@ -174,8 +174,8 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { saveJsonFileName=UUIDUtils.randomUUID20()+"_"+jsonFile.getOriginalFilename(); saveJsonFilePath=ocrFilePath+saveJsonFileName; logger.info(saveJsonFilePath); - //FileUtils.copyInputStreamToFile(jsonFile.getInputStream(),new File(saveJsonFilePath)); - savePic(jsonFile.getInputStream(),saveJsonFilePath); + FileUtils.copyInputStreamToFile(jsonFile.getInputStream(),new File(saveJsonFilePath)); +// savePic(jsonFile.getInputStream(),saveJsonFilePath); logger.info("Json存储完成"); } //开始将文件保存至数据库中 From 6e0091f8755ee734af67d949a7bf749302879ed0 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 26 Aug 2021 10:23:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/ScheduledJob.java | 4 ++-- .../da/slrs/sarStandWarning/entity/EarlyWarningEO.java | 6 ++++++ .../mybatis/mapper/sarStandWarning/SarStandardInfo.xml | 2 +- .../mybatis/mapper/sarStandWarning/SarStandardItem.xml | 8 +++++++- .../mapper/sarStandWarning/SarStandardWarningDao.xml | 4 +++- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 3261df90..815574da 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -56,8 +56,8 @@ public class ScheduledJob { private SarStandardInfoDao sarStandardInfoDao; - @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 -// @Scheduled(cron="*/5 * * * * ?") +// @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 + @Scheduled(cron="*/5 * * * * ?") @Async public void schedulingTasks() { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index e7cffdeb..e33134a9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -24,6 +24,9 @@ public class EarlyWarningEO extends BaseEntity { @TableId("ID") private String id; + @TableField("STAND_ID") + private String standId; + @TableField("STAND_TYPE") private String standType; @@ -45,6 +48,9 @@ public class EarlyWarningEO extends BaseEntity { @TableField("ITEMS_ID") private String itemsId; + @TableField("ITEMS_NUM") + private String itemsNum; + @TableField("ITEMS_NAME") private String itemsName; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml index 3d82bdd6..518aa911 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml @@ -4,7 +4,7 @@ - + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml index 58a4b8eb..01a5167a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml @@ -4,7 +4,10 @@ - + + + + @@ -16,12 +19,15 @@