diff --git a/src/main/java/com/docus/bgts/config/MyScheduling.java b/src/main/java/com/docus/bgts/config/MyScheduling.java index 6128209..53216cc 100644 --- a/src/main/java/com/docus/bgts/config/MyScheduling.java +++ b/src/main/java/com/docus/bgts/config/MyScheduling.java @@ -51,9 +51,10 @@ public class MyScheduling { if(isStartCollect.equals("0")){ return; } - if(!collectorid.equals(Codes.SMCODE.getCode())){ + if((!collectorid.equals(Codes.SMCODE.getCode()))&&(!collectorid.equals(Codes.ZZCODE.getCode()))){ return; } + bgtsService.timerCollect(); } diff --git a/src/main/java/com/docus/bgts/enums/Codes.java b/src/main/java/com/docus/bgts/enums/Codes.java index 17b1226..55dce80 100644 --- a/src/main/java/com/docus/bgts/enums/Codes.java +++ b/src/main/java/com/docus/bgts/enums/Codes.java @@ -27,6 +27,7 @@ public enum Codes { //上传接口地址 UPLOAD("0","uploadConnector"), SMCODE ("5","手麻代码"), + ZZCODE ("15","重症代码"), //患者主索引号 EMP_ID("0","indexFlag"), //错误日志编号 diff --git a/src/main/java/com/docus/bgts/service/BgtsServiceImpl.java b/src/main/java/com/docus/bgts/service/BgtsServiceImpl.java index e181944..808d965 100644 --- a/src/main/java/com/docus/bgts/service/BgtsServiceImpl.java +++ b/src/main/java/com/docus/bgts/service/BgtsServiceImpl.java @@ -119,7 +119,9 @@ public class BgtsServiceImpl implements IBgtsService { List fieldArr=new ArrayList<>(); fieldArr.add(indexFlag); fieldArr.add(serialnum); - fieldArr.add(filetitle); + if(StringUtils.isNotBlank(filetitle)){ + fieldArr.add(filetitle); + } fieldArr.add(downurl); String namespace = String.valueOf(FileUtils.getJsonByName("namespace")); String tableName = String.valueOf(FileUtils.getJsonByName("tableName")); @@ -147,7 +149,7 @@ public class BgtsServiceImpl implements IBgtsService { reportDownScanFileDto.setDownurl(String.valueOf(map.get(downurl))); reportDownScanFileDto.setFilestoragetype(filestoragetype); reportDownScanFileDto.setFilesource(filesource); - reportDownScanFileDto.setFiletitle(String.valueOf(map.get(filetitle))); + reportDownScanFileDto.setFiletitle(map.get(filetitle)==null?"重症"+(new Date().getTime()):String.valueOf(map.get(filetitle))); reportDownScanFileDto.setSerialnum(StringUtils.isNotBlank(String.valueOf(map.get(serialnum)))?String.valueOf(map.get(serialnum)):String.valueOf(idWorker.nextId())); reportDownScanFileDtos.add(reportDownScanFileDto); reportDownDto.setScanfiles(reportDownScanFileDtos); diff --git a/src/main/java/com/docus/bgts/web/MyFilter.java b/src/main/java/com/docus/bgts/web/MyFilter.java index 9d97825..285a166 100644 --- a/src/main/java/com/docus/bgts/web/MyFilter.java +++ b/src/main/java/com/docus/bgts/web/MyFilter.java @@ -22,6 +22,8 @@ public class MyFilter implements Filter { String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid")); if(collectorid.equals(Codes.SMCODE.getCode())){ logger.info("-----当前请求已被拦截...------"); + }else if(collectorid.equals(Codes.ZZCODE.getCode())){ + logger.info("-----当前请求已被拦截...------"); }else { filterChain.doFilter(servletRequest,servletResponse); } diff --git a/src/main/resources/mapper/dboracle/VDocumentPdfMapper.xml b/src/main/resources/mapper/dboracle/VDocumentPdfMapper.xml index 2eac4df..54074b4 100644 --- a/src/main/resources/mapper/dboracle/VDocumentPdfMapper.xml +++ b/src/main/resources/mapper/dboracle/VDocumentPdfMapper.xml @@ -15,12 +15,12 @@ ( SELECT - "${namespace}"."${tableName}"."${field}" + ${namespace}.${tableName}.${field} FROM - "${namespace}"."${tableName}" + ${namespace}.${tableName} WHERE - "${collectTimeName}" BETWEEN TO_DATE ( #{startTime}, 'YYYY-MM-DD HH24:MI:SS' ) + ${collectTimeName} BETWEEN TO_DATE ( #{startTime}, 'YYYY-MM-DD HH24:MI:SS' ) AND TO_DATE ( #{endTime}, 'YYYY-MM-DD HH24:MI:SS' ) ) "NAVICAT_TABLE" WHERE