From d6771eabe145fc8a5f525e56fcc064a63a90de15 Mon Sep 17 00:00:00 2001 From: zyd Date: Wed, 12 Oct 2022 23:43:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/login/security/WebMvcConfig.java | 5 +-- .../adc/da/scheduled/CheckEncryFileJob.java | 34 ++++++++++++++++++ .../da/scheduled/controller/Controller.java | 20 ++++++++--- .../SarBussionessStandController.java | 7 +--- .../impl/SarBussionessStandServiceImpl.java | 1 - .../SarStandardsInfoController.java | 8 ----- .../service/ISarStandardsInfoService.java | 1 - .../impl/SarStandardsInfoServiceImpl.java | 36 ------------------- 8 files changed, 52 insertions(+), 60 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/scheduled/CheckEncryFileJob.java diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 2aff26bd..9fc0eb38 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -112,11 +112,8 @@ public class WebMvcConfig implements WebMvcConfigurer { //预警导出 addInterceptor.excludePathPatterns("/api/sys/EarlyWarning/exportWarning"); - //企标文件检查接口 - addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/checkFileByEncrypt"); - //标准文件检查接口 - addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/checkFileByEncrypt"); + addInterceptor.excludePathPatterns("/api/scheduled/checkFileByEncrypt"); //OCR回调存储文件 addInterceptor.excludePathPatterns("/api/ocr/OCRRestful/OcrHandleResult"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/CheckEncryFileJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/CheckEncryFileJob.java new file mode 100644 index 00000000..8b51559d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/CheckEncryFileJob.java @@ -0,0 +1,34 @@ +package com.adc.da.scheduled; + + +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.stereotype.Component; + +@EnableScheduling +@Component +@Slf4j +public class CheckEncryFileJob { + + @Autowired + ISarBussionessStandService iSarBussionessStandService; + + @Autowired + ISarStandardsInfoService iSarStandardsInfoService; + + @Async + public void asyncCheckBussStandEncryptFile(){ + iSarBussionessStandService.checkFileByEncrypt(); + } + + + @Async + public void asyncCheckStandEncryptFile(){ + iSarStandardsInfoService.checkFileByEncrypt(); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/controller/Controller.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/controller/Controller.java index b38dfaa3..af254984 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/controller/Controller.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/controller/Controller.java @@ -1,12 +1,13 @@ package com.adc.da.scheduled.controller; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.scheduled.CheckEncryFileJob; import com.adc.da.scheduled.ScheduledJob; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/${restPath}/scheduled") @@ -17,6 +18,9 @@ public class Controller { @Autowired ScheduledJob scheduledJob; + @Autowired + CheckEncryFileJob checkEncryFileJob; + @PutMapping("/warning") public void warning(){ scheduledJob.warningSchedulingTasks(); @@ -28,4 +32,12 @@ public class Controller { } + @ApiOperation(value = "标准原始文件判断是否是加密文件") + @GetMapping("/checkFileByEncrypt") + public ResponseMessage checkFileByEncrypt() { + checkEncryFileJob.asyncCheckStandEncryptFile(); + checkEncryFileJob.asyncCheckBussStandEncryptFile(); + return Result.success("开始判断中稍后到服务器中查看文件"); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 6287698b..7f93d5b5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -365,12 +365,7 @@ public class SarBussionessStandController extends BaseController return "1"; } - @ApiOperation(value = "企业标准原始文件判断是否是加密文件") - @GetMapping("/checkFileByEncrypt") - public ResponseMessage checkFileByEncrypt() { - sarStandardsInfoEOService.checkFileByEncrypt(); - return Result.success("开始判断中稍后到服务器中查看文件"); - } - - } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index a1899b2b..bb5f2df4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -1,6 +1,5 @@ package com.adc.da.slrs.sarStandardsInfo.service; -import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile; import com.adc.da.slrs.sarStandFile.entity.SarStandFile; import com.adc.da.slrs.sarStandardsInfo.entity.*; import com.adc.da.http.ResponseMessage; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 3da396b7..48f2c7cd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -11,18 +11,11 @@ import com.adc.da.slrs.regulations.entity.SearchStandContext; import com.adc.da.slrs.regulations.entity.StandData; import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; -import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService; -import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile; -import com.adc.da.slrs.sarBussStandFile.service.ISarBussStandFileService; -import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; -import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarFindDto; import com.adc.da.slrs.sarPosition.entity.TsPosition; import com.adc.da.slrs.sarPosition.service.ITsPositionService; -import com.adc.da.slrs.sarStandAttrInfo.service.ISarStandAttrInfoService; import com.adc.da.slrs.sarStandFile.service.ISarStandFileService; -import com.adc.da.slrs.sarStandWarning.dao.WarningDateDao; import com.adc.da.slrs.sarStandWarning.entity.WarningDate; import com.adc.da.slrs.sarStandWarning.service.Impl.WarningDateServiceImpl; import com.adc.da.slrs.sarUser.entity.TsUser; @@ -79,10 +72,6 @@ import com.adc.da.slrs.standardSplit.dao.SarFileSplitInfoEODao; import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO; import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; -import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao; -import com.adc.da.slrs.tsDictionaryType.dao.TsDictionaryDao; -import com.adc.da.slrs.tsDictionaryType.entity.TsDicType; -import com.adc.da.slrs.tsDictionaryType.entity.TsDictionary; import com.adc.da.sys.common.SelectionResult; import com.adc.da.sys.constant.ValueStateEnum; import com.adc.da.sys.dao.DicTypeEODao; @@ -97,7 +86,6 @@ import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.json.JSONObject; -import org.apache.catalina.User; import org.apache.commons.lang3.StringUtils; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.util.PDFTextStripper; @@ -113,7 +101,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -255,28 +242,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl