From 11c1a29710ddce2e1988533e90183cdc8c228a64 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 19 Jun 2023 13:43:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?39=20=E6=B5=8B=E8=AF=95=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91=E6=96=87=E4=BB=B6=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkFlowController.java | 9 +- .../OnlineFileLog/entity/OnlineFileLog.java | 3 + .../impl/SarBussionessStandServiceImpl.java | 103 ++++-- .../adc/da/utils/util/OnlyofficePdfUtil.java | 310 ++++++++++++++++++ 4 files changed, 394 insertions(+), 31 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/utils/util/OnlyofficePdfUtil.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index a6769c8e..e98b0c20 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -1041,7 +1041,7 @@ public class WorkFlowController extends BaseController { @ApiOperation(value = "查找在线编辑文件") @GetMapping("/selectOnlineFile") - public ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId,@RequestParam("standName") String standName) { + public ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId,@RequestParam("standName") String standName,@RequestParam("key") String key) { logger.info("======================standName===============================！！！！！！！！！！！！！！！！！！！！！！"+standName); String path = standEditFilePath+"/hisFile/"; File file = null; @@ -1091,6 +1091,7 @@ public class WorkFlowController extends BaseController { onlineFileLog.setCreateTime(new Date()); onlineFileLog.setFileName(String.valueOf(time)); onlineFileLog.setValidFlag("0"); + onlineFileLog.setFilekey(key); onlineFileLogDao.insert(onlineFileLog); logger.info("======================日志存入成功==============================="+onlineFileLog.toString()); if(StringUtils.isNotBlank(standName)) { @@ -1516,4 +1517,10 @@ public class WorkFlowController extends BaseController { public String fushen(){ return workFlowFeignClient.fushen(); } + + @ApiOperation(value = "|在线文件调用api") + @PostMapping("/conversionOnlineFilePDF") + public void conversionOnlineFilePDF(){ + // return workFlowFeignClient.conversionOnlineFilePDF(); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/entity/OnlineFileLog.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/entity/OnlineFileLog.java index ee0ee521..4afe07b8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/entity/OnlineFileLog.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/entity/OnlineFileLog.java @@ -67,6 +67,9 @@ public class OnlineFileLog extends BaseEntity { @TableField("VALID_FLAG") private String validFlag; + @ApiModelProperty(value = "文件key") + @TableField("FILE_KEY") + private String filekey; //跨服io流转换 @TableField(exist = false) private byte[] bytes; 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 413f9fef..e766f5be 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 @@ -219,6 +219,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarBussStandFilesList = sarBussStandFileEODao.selectList(objectQueryWrapperSarBussStandFile); if(sarBussStandFilesList.isEmpty() && sarBussStandFilesList.size()==0){ -// AttFileVo attFileVo = attFileEOService.wordConversionFilePdf(sarBussStandFiles.get(0).getOriAttId()); + //存储的名称，key 路径 + QueryWrapper onlineFileLogWrapper = new QueryWrapper<>(); + onlineFileLogWrapper.eq("ATT_FILE_ID",sarBussStandFilesList.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())){ + try { + onlyofficePdfUtil.downloadFile(onlineFileLogs.get(0).getOLdFileName(), onlineFileLogs.get(0).getFilekey(), onlineFileLogs.get(0).getFilePath()); + File file = new File(filePath+"/onlineFile/"+onlineFileLogs.get(0).getOLdFileName()); + if(file.exists()){ + AttFileVo attFileVo = attFileEOService.saveFileInfo(file); + 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转换失败================================="); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + }else { + logger.info("======================未能查询到在线编辑的日志文件================"); + } +// AttFileVo attFileVo = attFileEOService.onlineWordConversionFilePdf(sarBussStandFiles.get(0).getOriAttId()); // if(attFileVo!=null){ // SarBussStandFile sarBussStandFile = new SarBussStandFile(); // //sarBussStandFile.setId(); @@ -4943,28 +4986,28 @@ public class SarBussionessStandServiceImpl extends ServiceImpl bussMap = new HashMap<>(); - bussMap.put("FILE_SUFFIX",sarBussStandFiles.get(0).getFileSuffix()); - bussMap.put("CONVERFILENAME",filePath+fileInfo.getFilePath()+fileInfo.getFileName()); - bussMap.put("SAVEPDFPATH",filePath+fileInfo.getFilePath()+fileName+".pdf"); - bussMap.put("STANDID",sarBussStandFiles.get(0).getStandId()); - bussMap.put("STANDFILECLASSIFY",sarBussStandFiles.get(0).getStandFileClassify()); - bussMap.put("FILENAME",filePath+fileInfo.getFilePath()+fileName+".pdf"); - bussMap.put("PASSWORD",sarBussStandFiles.get(0).getPassword()); - bussMap.put("OAIATTID",sarBussStandFiles.get(0).getOriAttId()); - logger.info("======================================word.doc发送mq================================="); - createOnlineEditingFileMQService.OnlineEditingFileMQ(bussMap); - }else { - logger.info("======================================word.doc转换失败================================="); - } +// AttFileEO fileInfo = attFileEOService.getFileInfo(sarBussStandFiles.get(0).getOriAttId()); +// if(fileInfo!=null){ +// String fileName = ""; +// if(StringUtils.isNotBlank(fileInfo.getFileName())){ +// String[] splitInfo = fileInfo.getFileName().split("\\."); +// fileName = splitInfo[0]; +// } +// +// Map bussMap = new HashMap<>(); +// bussMap.put("FILE_SUFFIX",sarBussStandFiles.get(0).getFileSuffix()); +// bussMap.put("CONVERFILENAME",filePath+fileInfo.getFilePath()+fileInfo.getFileName()); +// bussMap.put("SAVEPDFPATH",filePath+fileInfo.getFilePath()+fileName+".pdf"); +// bussMap.put("STANDID",sarBussStandFiles.get(0).getStandId()); +// bussMap.put("STANDFILECLASSIFY",sarBussStandFiles.get(0).getStandFileClassify()); +// bussMap.put("FILENAME",filePath+fileInfo.getFilePath()+fileName+".pdf"); +// bussMap.put("PASSWORD",sarBussStandFiles.get(0).getPassword()); +// bussMap.put("OAIATTID",sarBussStandFiles.get(0).getOriAttId()); +// logger.info("======================================word.doc发送mq================================="); +// createOnlineEditingFileMQService.OnlineEditingFileMQ(bussMap); +// }else { +// logger.info("======================================word.doc转换失败================================="); +// } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/OnlyofficePdfUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/OnlyofficePdfUtil.java new file mode 100644 index 00000000..52302513 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/OnlyofficePdfUtil.java @@ -0,0 +1,310 @@ +package com.adc.da.utils.util; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.alibaba.fastjson.JSONObject; +import org.apache.http.HttpEntity; +import org.apache.http.HttpStatus; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.util.EntityUtils; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.PostMapping; + +import java.io.*; +import java.util.HashMap; +import java.util.Map; + +public class OnlyofficePdfUtil { + + @Value("${file.path}") + private String filePathInfo;//文件存储路径 + + public ResponseMessage downloadFile(String filePdfName, String key, String onlineFilePath) throws Exception { + + String filePath = filePathInfo+"/onlineFile/"+filePdfName; + + System.out.println("================"+filePath); + + String fileUrl = convertFile(key,onlineFilePath); + + System.out.println("=============================="+fileUrl); + + // 创建HttpClientBuilder + + HttpClientBuilder httpClientBuilder = HttpClientBuilder.create(); + + // HttpClient + + CloseableHttpClient closeableHttpClient = httpClientBuilder.build(); + + HttpGet get = new HttpGet(fileUrl); + + // 设置请求和传输超时时间 + + RequestConfig requestConfig = RequestConfig.custom() + + .setSocketTimeout(60000) + + .setConnectionRequestTimeout(60000) + + .setConnectTimeout(60000) + + .build(); + + get.setConfig(requestConfig); + + CloseableHttpResponse response = null; + + try { + + //发送get请求 + + response = closeableHttpClient.execute(get); + + if (response == null || response.getStatusLine() == null) { + + throw new Exception("发送GET请求失败，返回结果为空！"); + + } + + //返回状态是否200 + + int statusCode = response.getStatusLine().getStatusCode(); + + if (statusCode == HttpStatus.SC_OK) { + + //得到请求结果 + + HttpEntity entityRes = response.getEntity(); + + if (entityRes != null) { + + InputStream content = entityRes.getContent(); + + byte[] getData = readInputStream(content); + + File file = new File(filePath); + + FileOutputStream fos = new FileOutputStream(file); + + fos.write(getData); + + fos.close(); + + } + + } else { + + throw new Exception("发送GET请求出错：" + response); + + } + + } catch (Exception e) { + + throw new Exception("发送GET请求出现异常," + e.getMessage()); + + } finally { + + try { + + // 关闭连接释放资源 + + if (response != null) { + + response.close(); + + } + + if (closeableHttpClient != null) { + + closeableHttpClient.close(); + + } + + } catch (IOException e) { + + e.printStackTrace(); + + } + + } + + return Result.success(); + + } + + public String analysisXML(String xmlString) throws DocumentException { + + Document document = DocumentHelper.parseText(xmlString); + + Element rootElement = document.getRootElement(); + + String fileUrl = rootElement.elementText("FileUrl"); + + String newFileUrl = fileUrl.replaceAll("&", "&"); + + return newFileUrl; + + } + + public String convertFile(String key,String onlineFilePath) throws Exception{ + + String url = "http://47.92.92.38:8103/7.2.1-34/ConvertService.ashx"; + + Map map = new HashMap<>(); + + map.put("async",false); + + map.put("filetype","docx"); + + map.put("key",key); + + map.put("outputtype","pdf"); + + map.put("title","test.pdf"); + map.put("url","https://srms.foton.com.cn/file/"+onlineFilePath); + //map.put("url","https://srms.foton.com.cn/file/model/task_768330d8/task_768330d8_top_768330d8_node.docx"); + + JSONObject requestJson = new JSONObject(map); + + // 创建HttpClientBuilder + + HttpClientBuilder httpClientBuilder = HttpClientBuilder.create(); + + // HttpClient + + CloseableHttpClient closeableHttpClient = httpClientBuilder.build(); + + HttpPost httpPost = new HttpPost(url); + + // 设置请求和传输超时时间 + + RequestConfig requestConfig = RequestConfig.custom() + + .setSocketTimeout(60000) + + .setConnectionRequestTimeout(60000) + + .setConnectTimeout(60000) + + .build(); + + httpPost.setConfig(requestConfig); + + CloseableHttpResponse response = null; + + try { + + //设置post请求方式为JSON + + StringEntity data = new StringEntity(String.valueOf(requestJson), "UTF-8"); + + data.setContentType("application/json; charset=UTF-8"); + + httpPost.setEntity(data); + + + + //发送post请求 + + response = closeableHttpClient.execute(httpPost); + + if (response == null || response.getStatusLine() == null) { + + throw new Exception("发送POST请求失败，返回结果为空！"); + + } + + + + //返回状态是否200 + + int statusCode = response.getStatusLine().getStatusCode(); + + if (statusCode == HttpStatus.SC_OK) { + + //得到请求结果 + + HttpEntity entityRes = response.getEntity(); + + if (entityRes != null) { + + String responsetData = EntityUtils.toString(entityRes, "UTF-8"); + + String fileUrl = analysisXML(responsetData); + + return fileUrl; + + } + + } else { + + throw new Exception("发送POST-JSON请求出错：" + response); + + } + + } catch (Exception e) { + + throw new Exception("发送POST请求出现异常," + e.getMessage()); + + } finally { + + try { + + // 关闭连接释放资源 + + if (response != null) { + + response.close(); + + } + + if (closeableHttpClient != null) { + + closeableHttpClient.close(); + + } + + } catch (IOException e) { + + e.printStackTrace(); + + } + + } + + return null; + + } + + public static byte[] readInputStream(InputStream inputStream) throws IOException { + + byte[] buffer = new byte[1024]; + + int len = 0; + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + + while((len = inputStream.read(buffer)) != -1) { + + bos.write(buffer, 0, len); + + } + + bos.close(); + + return bos.toByteArray(); + + } +} From 3a523968c9bb6ceabe74187536964d1a763d5ba1 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 19 Jun 2023 14:26:17 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 43 ------------------- 1 file changed, 43 deletions(-) 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 e766f5be..d3a3d4f0 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 @@ -4965,49 +4965,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl bussMap = new HashMap<>(); -// bussMap.put("FILE_SUFFIX",sarBussStandFiles.get(0).getFileSuffix()); -// bussMap.put("CONVERFILENAME",filePath+fileInfo.getFilePath()+fileInfo.getFileName()); -// bussMap.put("SAVEPDFPATH",filePath+fileInfo.getFilePath()+fileName+".pdf"); -// bussMap.put("STANDID",sarBussStandFiles.get(0).getStandId()); -// bussMap.put("STANDFILECLASSIFY",sarBussStandFiles.get(0).getStandFileClassify()); -// bussMap.put("FILENAME",filePath+fileInfo.getFilePath()+fileName+".pdf"); -// bussMap.put("PASSWORD",sarBussStandFiles.get(0).getPassword()); -// bussMap.put("OAIATTID",sarBussStandFiles.get(0).getOriAttId()); -// logger.info("======================================word.doc发送mq================================="); -// createOnlineEditingFileMQService.OnlineEditingFileMQ(bussMap); -// }else { -// logger.info("======================================word.doc转换失败================================="); -// } } } From 579b54d2be9f018bb2b0d37561481aa027a23a5c Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 19 Jun 2023 14:45:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?39=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 5 +---- .../java/com/adc/da/utils/util/OnlyofficePdfUtil.java | 10 +++------- 2 files changed, 4 insertions(+), 11 deletions(-) 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 d3a3d4f0..af5509ce 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 @@ -219,9 +219,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Mon, 19 Jun 2023 16:19:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?add:=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96PDM?= =?UTF-8?q?C=E8=AF=BB=E5=8F=96=E6=96=87=E4=BB=B6=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PDMCSarLawsStandInfoController.java | 8 ++++---- .../dao/PDMCSarLawsStandInfoDao.java | 2 +- .../service/PDMCSarLawsStandInfoService.java | 2 +- .../impl/PDMCSarLawsStandInfoServiceImpl.java | 2 +- .../PDMCSarLawsStandInfoMapper.xml | 17 +++++++++++++---- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/controller/PDMCSarLawsStandInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/controller/PDMCSarLawsStandInfoController.java index 652197ae..fd974edd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/controller/PDMCSarLawsStandInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/controller/PDMCSarLawsStandInfoController.java @@ -41,20 +41,20 @@ public class PDMCSarLawsStandInfoController extends BaseController> getSarStandardsInfoPage( @RequestParam(value = "current", defaultValue = "1") Long current, @RequestParam(value = "limit",required = false) Long limit) throws Exception { + Long count = pdmcSarLawsStandInfoService.getSarStandardsCount(); if (ObjectUtil.isEmpty(limit)){ - int count = pdmcSarLawsStandInfoService.getSarStandardsCount(); if (count == 0) { return Result.error("文件信息为空"); } - limit = (long) count; + limit = count; } - Page page = new Page<>(current, limit); + Page page = new Page<>(current, limit,false); Page sarStandardsInfoPage = pdmcSarLawsStandInfoService.getSarStandardsInfo(page); PageInfo pdmcSarLawsStandInfoPageInfo = new PageInfo<>(); pdmcSarLawsStandInfoPageInfo.setList(sarStandardsInfoPage.getRecords()); pdmcSarLawsStandInfoPageInfo.setPageNo((int)sarStandardsInfoPage.getCurrent()); - pdmcSarLawsStandInfoPageInfo.setCount(sarStandardsInfoPage.getTotal()); + pdmcSarLawsStandInfoPageInfo.setCount(count); pdmcSarLawsStandInfoPageInfo.setPageSize((int) sarStandardsInfoPage.getSize()); if (pdmcSarLawsStandInfoPageInfo.getList().isEmpty()) { return Result.error("404","文件信息为空",pdmcSarLawsStandInfoPageInfo); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/dao/PDMCSarLawsStandInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/dao/PDMCSarLawsStandInfoDao.java index 23595d11..f8d095a9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/dao/PDMCSarLawsStandInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/dao/PDMCSarLawsStandInfoDao.java @@ -12,5 +12,5 @@ import java.util.List; public interface PDMCSarLawsStandInfoDao extends BaseMapper { Page getSarStandardsInfo(@Param("page")Page page); - int getSarStandardsCount(); + Long getSarStandardsCount(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/PDMCSarLawsStandInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/PDMCSarLawsStandInfoService.java index 2e6fb455..bad50303 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/PDMCSarLawsStandInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/PDMCSarLawsStandInfoService.java @@ -15,5 +15,5 @@ import java.util.List; public interface PDMCSarLawsStandInfoService extends IService { Page getSarStandardsInfo(Page page); - int getSarStandardsCount(); + Long getSarStandardsCount(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/impl/PDMCSarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/impl/PDMCSarLawsStandInfoServiceImpl.java index 1a046032..55cb0caa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/impl/PDMCSarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/impl/PDMCSarLawsStandInfoServiceImpl.java @@ -25,7 +25,7 @@ public class PDMCSarLawsStandInfoServiceImpl extends ServiceImpl - select count(1) - from sar_standards_info - left join sar_stand_menu on sar_standards_info.id=sar_stand_menu.STAND_ID order by sar_standards_info.ID asc + from (select + + from sar_standards_info ssi + left join sar_stand_menu ssm on ssi.id=ssm.STAND_ID) temp From 9eb859c6c4a5db3d17542ff5d9c5aa78c2ecac2b Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 19 Jun 2023 16:23:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=81=E6=A0=87=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 af5509ce..d751fe02 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 @@ -877,7 +877,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl newMap = new HashMap<>(); - Map oldMap = beforeSarStandardsInfo.getAttrInfoMap(); + Map oldMap = null; + if(beforeSarStandardsInfo!=null){ + oldMap = beforeSarStandardsInfo.getAttrInfoMap(); + } String attrStr = sarStandardsInfoEO.getSarStandAttrEOStr(); if (StringUtils.isNotBlank(attrStr)) { newMap = JSONObject.fromObject(attrStr);