tanzherong
/
docus-active-query-service-sm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

按需采集更新

Browse Source
docus-active-query-service_1.3
tan 3 years ago
parent c71c830113
commit e3bcc934d4
8 changed files with 195 additions and 166 deletions
Show Stats Download Patch File Download Diff File

2
dataConfig/homeQualitySet.json
Unescape Escape View File

@ -11,6 +11,8 @@
"downurl":"WEB_ADDRESS",
//分类id
"assortid":"15E7FE7803F545CB81390BC88E725240",
//过滤报告单,多个用逗号隔开
"filterReport":"病理送检标签,处方笺,麻醉处方精二-1,麻醉处方精二-2,术后镇痛",
//系统id
"collectorid":"14",
//采集类型(文件来源 1:采集器；2：扫描生产软件)

20
src/main/java/com/docus/bgts/config/MyConstruct.java
Unescape Escape View File

@ -17,6 +17,7 @@ public class MyConstruct {
@Autowired
IBgtsService bgtsService;
private Logger logger = LogManager.getLogger(MyConstruct.class);
/**
* 开启手麻全量采集
@ -35,15 +36,16 @@ public class MyConstruct {
/**
* 开启重症全量采集
*/
@PostConstruct
public void startCollectAll(){
String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
String startCollectTime = String.valueOf(FileUtils.getJsonByName("startCollectTime"));
String isStartCollect = String.valueOf(FileUtils.getJsonByName("isStartCollect"));
if(collectorid.equals(Codes.ZZCODE.getCode())&& StringUtils.isNotBlank(startCollectTime)&&isStartCollect!=null&&isStartCollect.equals("1")){
bgtsService.collectAll();
}
}
// @PostConstruct
// public void startCollectAll(){
// logger.info("全量采集开始------");
// String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
// String startCollectTime = String.valueOf(FileUtils.getJsonByName("startCollectTime"));
// String isStartCollect = String.valueOf(FileUtils.getJsonByName("isStartCollect"));
// if(collectorid.equals(Codes.ZZCODE.getCode())&& StringUtils.isNotBlank(startCollectTime)&&isStartCollect!=null&&isStartCollect.equals("1")){
// bgtsService.collectAll();
// }
// }

80
src/main/java/com/docus/bgts/config/MyScheduling.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.docus.bgts.config;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.docus.bgts.entity.TableJsonRead;
import com.docus.bgts.enums.Codes;
import com.docus.bgts.facade.IBgtsService;
import com.docus.bgts.service.CheckIntegrityService;
import com.docus.bgts.utils.FileUtils;
@ -29,9 +30,9 @@ public class MyScheduling {
private final String tempDataFileName="collectTimeTemp";
private final String lastTimeStr="lastTime";
static {
syncFlag=FileUtils.getJsonByName("syncFlag").toString();
}
// static {
// syncFlag=FileUtils.getJsonByName("syncFlag").toString();
// }
@Autowired
IBgtsService bgtsService;
@ -42,7 +43,7 @@ public class MyScheduling {
private Logger logger = LogManager.getLogger(MyScheduling.class);
//5分钟执行一次心跳
/*@Scheduled(fixedRate = 1000 * 60 * 5)
@Scheduled(fixedRate = 1000 * 60 * 5)
public void beat() {
Map<String, String> params = new HashMap<>();
params.put("code", String.valueOf(FileUtils.getJsonByName("collectorid")));
@ -52,7 +53,8 @@ public class MyScheduling {
e.printStackTrace();
logger.info("心跳推送出错，可能是住院服务没有开启");
}
}*/
}
/**
@ -62,10 +64,6 @@ public class MyScheduling {
// @Scheduled(fixedRate = 1000 * 60 * 10)
// public void collect() {
// String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
// String isStartCollect = String.valueOf(FileUtils.getJsonByName("isStartCollect"));
// if (isStartCollect.equals("0")) {
// return;
// }
// if ((!collectorid.equals(Codes.SMCODE.getCode())) && (!collectorid.equals(Codes.ZZCODE.getCode()))) {
// return;
// }
@ -74,9 +72,9 @@ public class MyScheduling {
/**
* 批量按需采集
* 5分钟执行一次
* 10分钟执行一次
*/
@Scheduled(fixedRate = 1000 * 5 )
@Scheduled(fixedRate = 1000 * 60 *10 )
public void collectByExamNo(){
String collectOpen = String.valueOf(FileUtils.getJsonByName("collectOpen"));
if (collectOpen.equals("1")){
@ -91,42 +89,42 @@ public class MyScheduling {
/**
* 完整性校验
*/
@Scheduled(fixedRate = 1000 * 5 * 60)
public void syncIntegrality() {
if (null == syncFlag || "0".equals(syncFlag)) {
} else {
//获取最后时间
String lastDate = getLastDate();
if(StringUtils.isNotBlank(lastDate)) {
Date date = new Date();
boolean flag = checkIntegrityService.addSyncIntegrality(lastDate, null);
if(flag) {
refreshLastDate(date);
}
}else{
logger.info("采集时间为空");
}
}
}
// @Scheduled(fixedRate = 1000 * 5 * 60)
// public void syncIntegrality() {
// if (null == syncFlag || "0".equals(syncFlag)) {
//
// } else {
// //获取最后时间
// String lastDate = getLastDate();
// if(StringUtils.isNotBlank(lastDate)) {
// Date date = new Date();
// boolean flag = checkIntegrityService.addSyncIntegrality(lastDate, null);
// if(flag) {
// refreshLastDate(date);
// }
// }else{
// logger.info("采集时间为空");
// }
// }
// }
/**
* 上次采集时间
* @return
*/
private String getLastDate(){
TableJsonRead tableJsonRead = new TableJsonRead();
Map<String,String> map = tableJsonRead.Read(tempfilePrefix, tempDataFileName,Map.class);
return map.get(lastTimeStr);
}
// private String getLastDate(){
// TableJsonRead tableJsonRead = new TableJsonRead();
// Map<String,String> map = tableJsonRead.Read(tempfilePrefix, tempDataFileName,Map.class);
// return map.get(lastTimeStr);
// }
/**
* 刷新上次采集时间
*/
private void refreshLastDate(Date lastDate){
String lastTime = DateUtil.format(lastDate, "yyyy-MM-dd HH:mm:ss");
TableJsonRead tableJsonRead = new TableJsonRead();
Map<String, String> map = new HashMap<>();
map.put(lastTimeStr, lastTime);
tableJsonRead.Save(tempfilePrefix, tempDataFileName, JSON.toJSONString(map));
}
// private void refreshLastDate(Date lastDate){
// String lastTime = DateUtil.format(lastDate, "yyyy-MM-dd HH:mm:ss");
// TableJsonRead tableJsonRead = new TableJsonRead();
// Map<String, String> map = new HashMap<>();
// map.put(lastTimeStr, lastTime);
// tableJsonRead.Save(tempfilePrefix, tempDataFileName, JSON.toJSONString(map));
// }
}

2
src/main/java/com/docus/bgts/mapper/dbmysql/AfCollectAddMapper.java
Unescape Escape View File

@ -14,7 +14,7 @@ public interface AfCollectAddMapper extends BaseMapper<AfCollectAdd> {
/**
* 获取最新的采集时间
*/
Date getTimeByAdd();
Date getTimeByAdd(Integer classIfy);
/**
* 获取jzh集合

199
src/main/java/com/docus/bgts/service/BgtsServiceImpl.java
Unescape Escape View File

@ -112,7 +112,7 @@ public class BgtsServiceImpl implements IBgtsService {
* @param startDate
* @param endDate
*/
/* private void collectByDates(String startDate, String endDate) {
private void collectByDates(String startDate, String endDate) {
//页码
int current;
//每页10条数据
@ -147,11 +147,21 @@ public class BgtsServiceImpl implements IBgtsService {
if (null == maps || maps.size() <= 0) {
break;
}
maps.stream().forEach(map -> {
maps:
for (Map map : maps) {
//获取过滤报告单
String[] filterReports = String.valueOf(FileUtils.getJsonByName("filterReport")).split(",");
if (filterReports.length > 0) {
for (String filterReport : filterReports) {
//需要过滤的报告单存在则不采集
if (String.valueOf(map.get(filetitle)).equals(filterReport)) {
continue maps;
}
}
}
ReportDownDto reportDownDto = new ReportDownDto();
reportDownDto.setCollectorid(collectorid);
reportDownDto.setAssortid(assortid);
ReportDownPatientDto reportDownPatientDto = new ReportDownPatientDto();
reportDownPatientDto.setJzh(String.valueOf(map.get(indexFlag)));
reportDownDto.setPatient(reportDownPatientDto);
@ -169,6 +179,7 @@ public class BgtsServiceImpl implements IBgtsService {
try {
afCollectTaskService.insert(reportDownDto);
//String uploadConnector = String.valueOf(FileUtils.getJsonByName("uploadConnector"));
//调用下载接口
post = HttpUtils.post(String.valueOf(FileUtils.getJsonByName(Codes.UPLOAD.getMessage())), headMap, JSON.parseObject(JSON.toJSONString(reportDownDto), Map.class));
Map resMap = JSON.parseObject(post, Map.class);
logger.info(reportDownDto);
@ -184,98 +195,104 @@ public class BgtsServiceImpl implements IBgtsService {
addMrReportErrorLog(reportDownDto);
e.printStackTrace();
}
});
}
}*/
}
}
/**
* 根据时间到采集任务 重症
*
* @param startDate
* @param endDate
*/
private void collectByDates(String startDate, String endDate) {
//页码
int current;
//每页10条数据
int size;
String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
String assortid = String.valueOf(FileUtils.getJsonByName("assortid"));
int filesource = Integer.parseInt(String.valueOf(FileUtils.getJsonByName("filesource")));
int filestoragetype = Integer.parseInt(String.valueOf(FileUtils.getJsonByName("filestoragetype")));
Map<String, Object> headMap = new HashMap<>();
headMap.put("Content-Type", "application/json");
SnowflakeIdWorker idWorker = new SnowflakeIdWorker(0, 0);
String indexFlag = String.valueOf(FileUtils.getJsonByName("indexFlag"));
String serialnum = String.valueOf(FileUtils.getJsonByName("serialnum"));
//String filetitle = String.valueOf(FileUtils.getJsonByName("filetitle"));
String downurl = String.valueOf(FileUtils.getJsonByName("downurl"));
List<String> fieldArr=new ArrayList<>();
fieldArr.add(indexFlag);
fieldArr.add(serialnum);
// if(StringUtils.isNotBlank(filetitle)){
// fieldArr.add(filetitle);
// private void collectByDates(String startDate, String endDate) {
// //页码
// int current;
// //每页10条数据
// int size;
// String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
// String assortid = String.valueOf(FileUtils.getJsonByName("assortid"));
// int filesource = Integer.parseInt(String.valueOf(FileUtils.getJsonByName("filesource")));
// int filestoragetype = Integer.parseInt(String.valueOf(FileUtils.getJsonByName("filestoragetype")));
// Map<String, Object> headMap = new HashMap<>();
// headMap.put("Content-Type", "application/json");
// SnowflakeIdWorker idWorker = new SnowflakeIdWorker(0, 0);
// String indexFlag = String.valueOf(FileUtils.getJsonByName("indexFlag"));
// String serialnum = String.valueOf(FileUtils.getJsonByName("serialnum"));
// //String filetitle = String.valueOf(FileUtils.getJsonByName("filetitle"));
// String downurl = String.valueOf(FileUtils.getJsonByName("downurl"));
// List<String> fieldArr=new ArrayList<>();
// fieldArr.add(indexFlag);
// fieldArr.add(serialnum);
//// if(StringUtils.isNotBlank(filetitle)){
//// fieldArr.add(filetitle);
//// }
// fieldArr.add(downurl);
// String namespace = String.valueOf(FileUtils.getJsonByName("namespace"));
// String tableName = String.valueOf(FileUtils.getJsonByName("tableName"));
// String collectTimeName = String.valueOf(FileUtils.getJsonByName("collectTimeName"));
// List<Map> maps;
// //2.获取第一页10条数据开始采集
// logger.info("开始时间-----"+startDate+"结束时间-----"+"\n"+endDate);
// for (current = 1; ; current++) {
// size = 10 * current;
// maps = vDocumentPdfMapper.listCollectPage(size-10, size, startDate, endDate, namespace, tableName, fieldArr, collectTimeName);
// logger.info("处理采集数据："+maps);
// if (null == maps || maps.size() <= 0) {
// break;
// }
// maps.stream().forEach(map -> {
// ReportDownDto reportDownDto = new ReportDownDto();
// reportDownDto.setCollectorid(collectorid);
// reportDownDto.setAssortid(assortid);
//
// ReportDownPatientDto reportDownPatientDto = new ReportDownPatientDto();
// reportDownPatientDto.setJzh(String.valueOf(map.get(indexFlag)));
// reportDownDto.setPatient(reportDownPatientDto);
//
// List<ReportDownScanFileDto> reportDownScanFileDtos = new ArrayList<>();
// ReportDownScanFileDto reportDownScanFileDto = new ReportDownScanFileDto();
// reportDownScanFileDto.setDownurl(String.valueOf(map.get(downurl)));
// reportDownScanFileDto.setFilestoragetype(filestoragetype);
// reportDownScanFileDto.setFilesource(filesource);
// //reportDownScanFileDto.setFiletitle(map.get(filetitle)==null?"重症"+(System.currentTimeMillis()):String.valueOf(map.get(filetitle)));
// reportDownScanFileDto.setFiletitle(StringUtils.isNotBlank(String.valueOf(map.get(serialnum)))?String.valueOf(map.get(serialnum)):String.valueOf(idWorker.nextId()));
// reportDownScanFileDto.setSerialnum(StringUtils.isNotBlank(String.valueOf(map.get(serialnum)))?String.valueOf(map.get(serialnum)):String.valueOf(idWorker.nextId()));
// reportDownScanFileDtos.add(reportDownScanFileDto);
// reportDownDto.setScanfiles(reportDownScanFileDtos);
// String post;
// try {
// afCollectTaskService.insert(reportDownDto);
// //String uploadConnector = String.valueOf(FileUtils.getJsonByName("uploadConnector"));
// post = HttpUtils.post(String.valueOf(FileUtils.getJsonByName(Codes.UPLOAD.getMessage())), headMap, JSON.parseObject(JSON.toJSONString(reportDownDto), Map.class));
// Map resMap = JSON.parseObject(post, Map.class);
// logger.info(reportDownDto);
// if (String.valueOf(resMap.get("code")).equals("500")) {
// throw new RuntimeException(String.valueOf(resMap.get("msg")));
// }
// } catch (Exception e) {
// //打印错误日志
// logger.info("采集出错："+reportDownDto);
// logger.info(e);
// String stackTrace = ExceptionUtils.getStackTrace(e);
// logger.info("错误信息----------"+stackTrace);
// addMrReportErrorLog(reportDownDto);
// e.printStackTrace();
// }
// });
// }
// }
fieldArr.add(downurl);
String namespace = String.valueOf(FileUtils.getJsonByName("namespace"));
String tableName = String.valueOf(FileUtils.getJsonByName("tableName"));
String collectTimeName = String.valueOf(FileUtils.getJsonByName("collectTimeName"));
List<Map> maps;
//2.获取第一页10条数据开始采集
logger.info("开始时间-----"+startDate+"结束时间-----"+"\n"+endDate);
for (current = 1; ; current++) {
size = 10 * current;
maps = vDocumentPdfMapper.listCollectPage(size-10, size, startDate, endDate, namespace, tableName, fieldArr, collectTimeName);
logger.info("处理采集数据："+maps);
if (null == maps || maps.size() <= 0) {
break;
}
maps.stream().forEach(map -> {
ReportDownDto reportDownDto = new ReportDownDto();
reportDownDto.setCollectorid(collectorid);
reportDownDto.setAssortid(assortid);
ReportDownPatientDto reportDownPatientDto = new ReportDownPatientDto();
reportDownPatientDto.setJzh(String.valueOf(map.get(indexFlag)));
reportDownDto.setPatient(reportDownPatientDto);
List<ReportDownScanFileDto> reportDownScanFileDtos = new ArrayList<>();
ReportDownScanFileDto reportDownScanFileDto = new ReportDownScanFileDto();
reportDownScanFileDto.setDownurl(String.valueOf(map.get(downurl)));
reportDownScanFileDto.setFilestoragetype(filestoragetype);
reportDownScanFileDto.setFilesource(filesource);
//reportDownScanFileDto.setFiletitle(map.get(filetitle)==null?"重症"+(System.currentTimeMillis()):String.valueOf(map.get(filetitle)));
reportDownScanFileDto.setFiletitle(StringUtils.isNotBlank(String.valueOf(map.get(serialnum)))?String.valueOf(map.get(serialnum)):String.valueOf(idWorker.nextId()));
reportDownScanFileDto.setSerialnum(StringUtils.isNotBlank(String.valueOf(map.get(serialnum)))?String.valueOf(map.get(serialnum)):String.valueOf(idWorker.nextId()));
reportDownScanFileDtos.add(reportDownScanFileDto);
reportDownDto.setScanfiles(reportDownScanFileDtos);
String post;
try {
afCollectTaskService.insert(reportDownDto);
//String uploadConnector = String.valueOf(FileUtils.getJsonByName("uploadConnector"));
post = HttpUtils.post(String.valueOf(FileUtils.getJsonByName(Codes.UPLOAD.getMessage())), headMap, JSON.parseObject(JSON.toJSONString(reportDownDto), Map.class));
Map resMap = JSON.parseObject(post, Map.class);
logger.info(reportDownDto);
if (String.valueOf(resMap.get("code")).equals("500")) {
throw new RuntimeException(String.valueOf(resMap.get("msg")));
}
} catch (Exception e) {
//打印错误日志
logger.info("采集出错："+reportDownDto);
logger.info(e);
String stackTrace = ExceptionUtils.getStackTrace(e);
logger.info("错误信息----------"+stackTrace);
addMrReportErrorLog(reportDownDto);
e.printStackTrace();
}
});
}
}
@Override
public void timerCollect() {
logger.info("------采集器开始采集---------");
String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
//1.获取上次采集时间
Date time = afCollectAddMapper.getTimeByAdd();
Date time;
if (collectorid.equals("5")) {
time = afCollectAddMapper.getTimeByAdd(5);
}else {
time = afCollectAddMapper.getTimeByAdd(15);
}
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String startDate = simpleDateFormat.format(time);
//当前日期
@ -440,6 +457,7 @@ public class BgtsServiceImpl implements IBgtsService {
/**
* 根据时间批量按需采集
*
* @param startDate 开始时间
* @param endDate 结束时间
* @param collectorId 采集器编号
@ -452,7 +470,7 @@ public class BgtsServiceImpl implements IBgtsService {
//通过唯一报告单号查询patient_id
//List<String> patientIdByC1 = afCollectTaskService.getPatientIdByC1(c1s);
//通过patientId集合查询jzh
List<String> jzhs = afCollectTaskService.getJzhByPatientId(patientIds);
//List<String> jzhs = afCollectTaskService.getJzhByPatientId(patientIds);
//int i = -1;
//循环jzh与报告单号c1调用按需采集
// for (String c1 : c1s) {
@ -470,9 +488,18 @@ public class BgtsServiceImpl implements IBgtsService {
// }
// }
try {
for (String jzh : jzhs) {
collect(jzh);
for (String patientId : patientIds) {
if (patientId!=null){
logger.info("按需采集------患者"+patientId);
collect(patientId);
}
}
// for (String jzh : jzhs) {
// if (jzh!=null) {
// logger.info("按需采集------患者"+jzh);
// collect(jzh);
// }
// }
} catch (Exception e) {
e.printStackTrace();
}

4
src/main/resources/logback-spring.xml
Unescape Escape View File

@ -44,7 +44,7 @@
<!-- 指定项目中某个包，当有日志操作行为时的日志记录级别 -->
<!-- com.liyan为根包，也就是只要是发生在这个根包下面的所有日志操作行为的权限都是DEBUG -->
<!-- 级别依次为【从高到低】：FATAL > ERROR > WARN > INFO > DEBUG > TRACE -->
<!--<logger name="com.docus.bgts" level="debug">
<logger name="com.docus.bgts" level="INFO">
<appender-ref ref="demolog" />
</logger>-->
</logger>
</configuration>

2
src/main/resources/mapper/dbmysql/AfCollectAddMapper.xml
Unescape Escape View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.docus.bgts.mapper.dbmysql.AfCollectAddMapper">
<select id="getTimeByAdd" resultType="date">
select begin_stage_date from af_collect_add where classify=5 limit 0,1
select begin_stage_date from af_collect_add where classify=#{classIfy} limit 0,1
</select>
<select id="listJzh" resultType="string">

2
src/main/resources/mapper/dbmysql/AfCollectTaskMapper.xml
Unescape Escape View File

@ -9,7 +9,7 @@
where jzh = #{jzh}
</select>
<select id="getjzhByDate" resultType="string">
select patient_id
select jzh
from docus_medicalrecord.t_basic
where dis_date between #{startDate} and #{endDate}
</select>

Write Preview
Loading…
Cancel
Save