diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 3170d113..2490f6e5 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://121.36.69.172:3307/foton_slrs_20230531?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false&serverTimezone=Asia/Shanghai +spring.datasource.url = jdbc:mysql://121.36.69.172:3307/foton_slrs_20230522?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false&serverTimezone=Asia/Shanghai spring.datasource.username = root spring.datasource.password = hzwlsoft.com diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index b84220b4..83990099 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -310,6 +310,9 @@ elas.flag=true elasticsearch.img=http://localhost:9090 +# 福田数据库备份脚本地址 +script.backup.foton.mySql.path.sh=11 + # \u6587\u6863\u8F6C\u6362TCP\u901A\u8BAF\u5730\u5740 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java index fb811286..867de294 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java @@ -67,4 +67,11 @@ public class SarBussStandFileController extends BaseController } } + + @ApiOperation(value = "|SarBussStandFileEO|批量修改加密文件不能打开问题") + @GetMapping("/batchUpdateSarBussFile") + /*@RequiresPermissions("lawss:sarLawsFile:list")*/ + public ResponseMessage batchUpdateSarBussFile() throws Exception { + return sarBussStandFileEOService.batchUpdateSarBussFile(); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java index ed6da497..6d05a20f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarBussStandFile.service; +import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile; import com.baomidou.mybatisplus.extension.service.IService; @@ -17,4 +18,5 @@ public interface ISarBussStandFileService extends IService { List selectFileByAttId(String attId) throws Exception; + ResponseMessage batchUpdateSarBussFile(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java index d95024f3..70b1ec3d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java @@ -1,12 +1,24 @@ package com.adc.da.slrs.sarBussStandFile.service.impl; +import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.att.vo.AttFileVo; +import com.adc.da.common.UseModuleEnum; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile; import com.adc.da.slrs.sarBussStandFile.dao.SarBussStandFileDao; import com.adc.da.slrs.sarBussStandFile.service.ISarBussStandFileService; +import com.adc.da.slrs.sarBussionessStand.service.impl.SarBussionessStandServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -20,11 +32,70 @@ import java.util.List; @Service public class SarBussStandFileServiceImpl extends ServiceImpl implements ISarBussStandFileService { + private static final Logger logger = LoggerFactory.getLogger(SarBussionessStandServiceImpl.class); + @Autowired private SarBussStandFileDao sarStandFileEODao; + @Autowired + private IAttFileEOService attFileEOService; + + @Value("${file.path}") + private String filePath;//文件存储路径 + @Override public List selectFileByAttId(String attId) throws Exception{ return sarStandFileEODao.selectFileByAttId(attId); } + + @Override + public ResponseMessage batchUpdateSarBussFile() { + List objects = new ArrayList<>(); + + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("USE_MODEL","SOURCE_FILE"); +// objectQueryWrapper.eq("FILE_SUFFIX","docx"); + objectQueryWrapper.ne("FILE_SUFFIX","pdf"); + objectQueryWrapper.ne("FILE_SUFFIX","PDF"); + List sarBussStandFiles = sarStandFileEODao.selectList(objectQueryWrapper); + if(!sarBussStandFiles.isEmpty()){ + for (SarBussStandFile data: sarBussStandFiles){ + + QueryWrapper objectQueryWrapperSarBussStandFile = new QueryWrapper<>(); + objectQueryWrapperSarBussStandFile.eq("USE_MODEL","SOURCE_FILE"); + objectQueryWrapperSarBussStandFile.eq("ORI_ATT_ID",data.getOriAttId()); +// objectQueryWrapper.eq("FILE_SUFFIX","docx"); + objectQueryWrapperSarBussStandFile.ne("FILE_SUFFIX","pdf"); + objectQueryWrapperSarBussStandFile.ne("FILE_SUFFIX","PDF"); + List sarBussStandFilesList = sarStandFileEODao.selectList(objectQueryWrapper); + if(!sarBussStandFilesList.isEmpty() && sarBussStandFilesList.size()==1){ + AttFileVo attFileVo = attFileEOService.wordConversionFilePdf(data.getOriAttId()); + if(attFileVo!=null){ + SarBussStandFile sarBussStandFile = new SarBussStandFile(); + //sarBussStandFile.setId(); + String uuId = com.adc.da.util.utils.UUID.randomUUID(20); + sarBussStandFile.setId(uuId); + sarBussStandFile.setStandId(data.getStandId()); + sarBussStandFile.setStandFileClassify(data.getStandFileClassify()); + sarBussStandFile.setAttId(attFileVo.getId()); + sarBussStandFile.setFileName(filePath+attFileVo.getFilePath()+attFileVo.getFileName()); + sarBussStandFile.setFileSuffix(attFileVo.getFileSuffix()); + sarBussStandFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); + sarBussStandFile.setPassword(data.getPassword()); + sarBussStandFile.setValidFlag(0); + sarBussStandFile.setCreationTime(new Date()); + sarBussStandFile.setModifyTime(new Date()); + sarBussStandFile.setOriAttId(data.getOriAttId()); + objects.add(sarBussStandFile); + sarStandFileEODao.insert(sarBussStandFile); + logger.info("======================================正在转换================================="); + }else { + logger.info("======================================word.doc转换失败================================="); + } + } + } + } + logger.info("======================================转换完成================================="+objects.toString()); + return Result.success(); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index ebe6f42f..247e3b1b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -4902,29 +4902,35 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarBussStandFiles = sarBussStandFileEODao.selectList(objectQueryWrapper); // 为空暂不处理 不为空则意味pdf生成失败 - if(!sarBussStandFiles.isEmpty() && sarBussStandFiles.size()==1){ - AttFileVo attFileVo = attFileEOService.wordConversionFilePdf(sarBussStandFiles.get(0).getOriAttId()); - if(attFileVo!=null){ - SarBussStandFile sarBussStandFile = new SarBussStandFile(); - //sarBussStandFile.setId(); - String uuId = com.adc.da.util.utils.UUID.randomUUID(20); - sarBussStandFile.setId(uuId); - sarBussStandFile.setStandId(sarBussStandFiles.get(0).getStandId()); - sarBussStandFile.setStandFileClassify(sarBussStandFiles.get(0).getStandFileClassify()); - sarBussStandFile.setAttId(attFileVo.getId()); - sarBussStandFile.setFileName(filePath+attFileVo.getFilePath()+attFileVo.getFileName()); - sarBussStandFile.setFileSuffix(attFileVo.getFileSuffix()); - sarBussStandFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); - sarBussStandFile.setPassword(sarBussStandFiles.get(0).getPassword()); - sarBussStandFile.setValidFlag(0); - sarBussStandFile.setCreationTime(new Date()); - sarBussStandFile.setModifyTime(new Date()); - sarBussStandFile.setOriAttId(sarBussStandFiles.get(0).getOriAttId()); - sarBussStandFileEODao.insert(sarBussStandFile); - }else { - logger.info("======================================word.doc转换失败================================="); + if(!sarBussStandFiles.isEmpty()) { + QueryWrapper objectQueryWrapperSarBussStandFile = new QueryWrapper<>(); + objectQueryWrapperSarBussStandFile.eq("ORI_ATT_ID", sarBussStandFiles.get(0).getOriAttId()); + List sarBussStandFilesList = sarBussStandFileEODao.selectList(objectQueryWrapperSarBussStandFile); + if(!sarBussStandFilesList.isEmpty() && sarBussStandFilesList.size()==1){ + AttFileVo attFileVo = attFileEOService.wordConversionFilePdf(sarBussStandFiles.get(0).getOriAttId()); + if(attFileVo!=null){ + SarBussStandFile sarBussStandFile = new SarBussStandFile(); + //sarBussStandFile.setId(); + String uuId = com.adc.da.util.utils.UUID.randomUUID(20); + sarBussStandFile.setId(uuId); + sarBussStandFile.setStandId(sarBussStandFiles.get(0).getStandId()); + sarBussStandFile.setStandFileClassify(sarBussStandFiles.get(0).getStandFileClassify()); + sarBussStandFile.setAttId(attFileVo.getId()); + sarBussStandFile.setFileName(filePath+attFileVo.getFilePath()+attFileVo.getFileName()); + sarBussStandFile.setFileSuffix(attFileVo.getFileSuffix()); + sarBussStandFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); + sarBussStandFile.setPassword(sarBussStandFiles.get(0).getPassword()); + sarBussStandFile.setValidFlag(0); + sarBussStandFile.setCreationTime(new Date()); + sarBussStandFile.setModifyTime(new Date()); + sarBussStandFile.setOriAttId(sarBussStandFiles.get(0).getOriAttId()); + sarBussStandFileEODao.insert(sarBussStandFile); + }else { + logger.info("======================================word.doc转换失败================================="); + } } } + } return "2"; }