diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/controller/OnlineFileLogController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/controller/OnlineFileLogController.java index 9eb258e9..1b1d69ab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/controller/OnlineFileLogController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/controller/OnlineFileLogController.java @@ -6,11 +6,17 @@ import com.adc.da.slrs.OnlineFileLog.service.OnlineFileLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; +import org.springframework.amqp.rabbit.annotation.Exchange; +import org.springframework.amqp.rabbit.annotation.Queue; +import org.springframework.amqp.rabbit.annotation.QueueBinding; +import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.*; + @RestController @RequestMapping("/${restPath}/lawss/OnlineFileLog") @Api(description = "|OnlineFileLog|") @@ -29,4 +35,26 @@ public class OnlineFileLogController { return Result.error("转换失败"); } } + + @RabbitListener(bindings = @QueueBinding( + value = @Queue(value = "createBussMQ_onlineId_MQ_file", durable = "true"), + exchange = @Exchange(value = "create-onlineId_MQ_file", ignoreDeclarationExceptions = "true"), + key = "create-key_onlineId_MQ_file")) + public List createonlineIdMQ(Map bussMap) throws Exception{ + List obj = new ArrayList<>(); + String onlineid = bussMap.get("ONLINEID"); + if(StringUtils.isNotBlank(onlineid)){ + String attFileIds = onlineFileLogService.selectOnlineFile(onlineid); + if(StringUtils.isNotBlank(attFileIds)){ + String[] split = attFileIds.split(","); + if(split != null) { + List asList = Arrays.asList(split); + for (String data : asList){ + obj.add(data); + } + } + } + } + return obj; + } } 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 f439f28e..5984cd8e 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 @@ -72,6 +72,7 @@ public class SarBussStandFileController extends BaseController @GetMapping("/batchUpdateSarBussFile") /*@RequiresPermissions("lawss:sarLawsFile:list")*/ public ResponseMessage> batchUpdateSarBussFile() throws Exception { + //当前不适用 return sarBussStandFileEOService.batchUpdateSarBussFile(); } @@ -79,6 +80,7 @@ public class SarBussStandFileController extends BaseController @GetMapping("/batchUpdateSarBussFileMQ") /*@RequiresPermissions("lawss:sarLawsFile:list")*/ public ResponseMessage> batchUpdateSarBussFileMQ() throws Exception { + //非在线编辑文件可转换pdf return sarBussStandFileEOService.batchUpdateSarBussFileMQ(); } } 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 d751fe02..0a27713a 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 @@ -4927,7 +4927,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl onlineFileLogWrapper = new QueryWrapper<>(); - onlineFileLogWrapper.eq("ATT_FILE_ID",sarBussStandFilesList.get(0).getOriAttId()); + onlineFileLogWrapper.eq("ATT_FILE_ID",sarBussStandFiles.get(0).getOriAttId()); List onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogWrapper); if(!onlineFileLogs.isEmpty()){ if(StringUtils.isNotBlank(onlineFileLogs.get(0).getOLdFileName()) && StringUtils.isNotBlank(onlineFileLogs.get(0).getFilekey()) && StringUtils.isNotBlank(onlineFileLogs.get(0).getFilePath())){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java index 360b982f..2fb73bc5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java @@ -1,5 +1,7 @@ package com.adc.da.slrs.sarBussionessStandState.sync; +import com.adc.da.search.bean.SearchCenter; +import com.adc.da.search.server.ResetSearchCenterServiceTemp; import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; @@ -53,6 +55,8 @@ public class StateSync { @Autowired private ISarUpdLogService sarUpdLogEOService; + @Autowired + private ResetSearchCenterServiceTemp resetSearchCenterServiceTemp; /** * 根据配置文件设置是否开启定时器 */ @@ -382,8 +386,13 @@ public class StateSync { } } } - @Scheduled(cron = "0 30 13 * * ?") - public void shangBan(){ - logger.info("下午的工作时间开始了,加油!"); + @Scheduled(cron = "0 0 1 * * ?")//每天一点执行同步es任务 + public void ALLSearchCenter()throws Exception{ + if (isNotScheduled){ + logger.info("开始执行es数据同步"); + SearchCenter searchCenter = new SearchCenter(); + searchCenter.setExecType("ALL"); + resetSearchCenterServiceTemp.syncResetALLSearchCenter(searchCenter); + } } } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index 4320f1d9..a1cb7ed1 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -4,11 +4,11 @@ import com.adc.da.att.dao.UserDao; import com.adc.da.att.entity.AttFileEO; import com.adc.da.att.entity.TsUser; import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.att.util.CreateOnlineAttIdFileMQUtil; import com.adc.da.att.vo.AttFileVo; import com.adc.da.file.store.IFileStore; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; -import com.adc.da.sys.entity.UserEO; import com.adc.da.util.MD5Util; import com.adc.da.util.UUIDUtils; import com.adc.da.util.WaterMarkUtil; @@ -32,8 +32,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotNull; import java.io.*; -import java.net.URL; -import java.net.URLConnection; import java.net.URLEncoder; import java.nio.file.Files; import java.text.SimpleDateFormat; @@ -69,6 +67,9 @@ public class AttFileEOController { @Value("${upload.file.white.lists}") private String uploadFileWhiteLists; //上传文件白名单 + @Autowired + private CreateOnlineAttIdFileMQUtil createOnlineAttIdFileMQUtil; + @ApiOperation(value = "|获取企标文件") @GetMapping("/getBusStandFileByAttId") @@ -328,6 +329,17 @@ public class AttFileEOController { @GetMapping("/downloadFileForSarNew") // @RequiresPermissions("sys:file:downloadFileForSar") public void downloadFileForSarNew(String fileId, HttpServletResponse response, HttpServletRequest request) throws Exception { + if(StringUtils.isNotBlank(fileId)){ + if(!fileId.contains("ATT_FILE_")){ + Map bussMap = new HashMap<>(); + bussMap.put("ONLINEID",fileId); + String id = createOnlineAttIdFileMQUtil.CreateOnlineAttIdFileMQ(bussMap); + if(StringUtils.isNotBlank(id)) { + fileId = id; + } + } + } + AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); InputStream is = null; OutputStream os = null; diff --git a/adc-da-sys/src/main/java/com/adc/da/att/util/CreateOnlineAttIdFileMQUtil.java b/adc-da-sys/src/main/java/com/adc/da/att/util/CreateOnlineAttIdFileMQUtil.java new file mode 100644 index 00000000..58e91f61 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/att/util/CreateOnlineAttIdFileMQUtil.java @@ -0,0 +1,39 @@ +package com.adc.da.att.util; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.amqp.core.AmqpTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.*; + +@Component +public class CreateOnlineAttIdFileMQUtil { + + @Autowired + private AmqpTemplate rabbitTemplate; + + /** + * + * @param + * @param //在线编辑的id转换为att格式 + */ + public String CreateOnlineAttIdFileMQ(Map standMap){ + //发送消息队列 + Object obj = this.rabbitTemplate.convertSendAndReceive("create-onlineId_MQ_file", "create-key_onlineId_MQ_file", standMap); + if(obj==null) { + return null; + } + Map objectObjectMap = new HashMap<>(); + objectObjectMap.put("attId",obj); + String id = ""; + Object attId = objectObjectMap.get("attId"); + if(attId!=null){ + id = attId.toString(); + String[] split = id.split("]"); + String[] split1 = split[0].split("\\["); + id = split1[1]; + } + return id; + } +}