fix: 接口注释修改

docus-active-query-service_1.3
wyb 4 months ago
parent 343ab80b1e
commit 51b8167055

@ -1,14 +1,11 @@
package com.docus.bgts.config;
import com.docus.bgts.enums.Codes;
import com.docus.bgts.facade.IBgtsService;
import com.docus.bgts.utils.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@Component
@ -22,16 +19,16 @@ public class MyConstruct {
/**
*
*/
@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.SMCODE.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.SMCODE.getCode())&& StringUtils.isNotBlank(startCollectTime)&&isStartCollect!=null&&isStartCollect.equals("1")){
// bgtsService.collectAll();
// }
// }
/**
*

@ -1,6 +1,5 @@
package com.docus.bgts.config;
import com.docus.bgts.enums.Codes;
import com.docus.bgts.facade.IBgtsService;
import com.docus.bgts.service.CheckIntegrityService;
import com.docus.bgts.utils.FileUtils;
@ -62,14 +61,15 @@ public class MyScheduling {
* /
* 10
*/
@Scheduled(fixedRate = 1000 * 60 * 10)
public void collect() {
String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
if ((!collectorid.equals(Codes.SMCODE.getCode())) && (!collectorid.equals(Codes.ZZCODE.getCode()))) {
return;
}
bgtsService.timerCollect();
}
// @Scheduled(fixedRate = 1000 * 60 * 10)
// public void collect() {
// String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
// if ((!collectorid.equals(Codes.SMCODE.getCode())) && (!collectorid.equals(Codes.ZZCODE.getCode()))) {
// return;
// }
// bgtsService.timerCollect();
// }
//
// // 时间
// private static List<String> date = new ArrayList<>();
@ -149,23 +149,23 @@ public class MyScheduling {
//
// }
//
// @Scheduled(cron ="0 0 0 * * ?")
// public void collect(){
// String intervalDayOpen = String.valueOf(FileUtils.getJsonByName("intervalDayOpen"));
// if (intervalDayOpen.equals("1")){
// try{
// String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
// int day = Integer.parseInt(String.valueOf(FileUtils.getJsonByName("intervalDay")));
// logger.info("0点采集前"+day+"天出院数据");
// Map<String, String> dateCollectionTime = getDateCollectionTime(new Date(), day);
// logger.info("采集"+dateCollectionTime.get("startDate")+"至-------"+dateCollectionTime.get("endDate")+"数据");
// bgtsService.collectByDate(dateCollectionTime.get("startDate"),dateCollectionTime.get("endDate"),collectorid,String.valueOf(0));
// }catch (Exception e) {
// logger.error("pacs二次采集出错---"+e.getMessage());
// }
//
// }
// }
@Scheduled(cron ="0 0 0 * * ?")
public void collect(){
String intervalDayOpen = String.valueOf(FileUtils.getJsonByName("intervalDayOpen"));
if (intervalDayOpen.equals("1")){
try{
String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
int day = Integer.parseInt(String.valueOf(FileUtils.getJsonByName("intervalDay")));
logger.info("0点采集前"+day+"天出院数据");
Map<String, String> dateCollectionTime = getDateCollectionTime(new Date(), day);
logger.info("采集"+dateCollectionTime.get("startDate")+"至-------"+dateCollectionTime.get("endDate")+"数据");
bgtsService.collectByDate(dateCollectionTime.get("startDate"),dateCollectionTime.get("endDate"),collectorid,String.valueOf(0));
}catch (Exception e) {
logger.error("pacs二次采集出错---"+e.getMessage());
}
}
}
/**

@ -5,7 +5,6 @@ import com.docus.bgts.config.MyScheduling;
import com.docus.bgts.entity.CommonResult;
import com.docus.bgts.facade.IAfCollectTaskService;
import com.docus.bgts.facade.IBgtsService;
import com.docus.bgts.facade.IMzSyncService;
import com.docus.bgts.service.CheckIntegrityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@ -18,8 +17,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
@Api(value = "采集接口", tags = "采集接口")
@RestController
@ -36,194 +33,194 @@ public class BgtsController {
@Autowired
IAfCollectTaskService afCollectTaskService;
// @ApiOperation("完整性同步程序开关0关闭 1开启")
// @GetMapping("/onOffSync")
// public void onOffSync(@RequestParam(value = "flag",defaultValue = "0") String flag){
// MyScheduling.syncFlag=flag;
// }
//
// @GetMapping("/addSyncIntegrality")
// public void addSyncIntegrality(@RequestParam("startDate")String startDate,String endDate){
// checkIntegrityService.addSyncIntegrality(startDate,endDate);
// }
//
// @GetMapping("/addSyncIntegralityByJzhs")
// public CommonResult<String> addSyncIntegrality(@RequestParam("jzhs")String jzhs){
// if(jzhs.split(",").length > 100){
// return CommonResult.failed("jzh个数不能超过100个");
// }
// checkIntegrityService.addSyncIntegralityByJzhs(jzhs);
// return CommonResult.success("完成");
// }
@ApiOperation("完整性同步程序开关0关闭 1开启")
@GetMapping("/onOffSync")
public void onOffSync(@RequestParam(value = "flag",defaultValue = "0") String flag){
MyScheduling.syncFlag=flag;
}
@GetMapping("/addSyncIntegrality")
public void addSyncIntegrality(@RequestParam("startDate")String startDate,String endDate){
checkIntegrityService.addSyncIntegrality(startDate,endDate);
}
// @ApiOperation("采集接口")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class),
// @ApiImplicitParam(name = "collectSubId",value = "af_interface_collect_sub表id",required = true)
// })
// @GetMapping("/collect")
// public CommonResult<String> collect(@RequestParam("collectSubId") String collectSubId,
// @RequestParam("empId") String empId) {
// try {
// logger.info("采集接口接收到参数:\nempId--"+empId+"\ncollectSubId--"+collectSubId);
// bgtsService.collect(empId);
// logger.info("采集完成");
// afCollectTaskService.updateInterfaceCollect(collectSubId, 1);
// logger.info("------------采集结束-----------");
// } catch (RuntimeException e) {
// e.printStackTrace();
// try {
// afCollectTaskService.updateInterfaceCollect(collectSubId, 0);
// }catch (Exception e1) {
// logger.info(e1.getMessage());
// return CommonResult.failed(e1.getMessage());
// }
// return CommonResult.failed(e.getMessage());
// }
// catch (Exception e) {
// e.printStackTrace();
// }catch (Throwable t){
// t.printStackTrace();
// logger.error("throwable{}", t.getMessage());
// }
// return CommonResult.success("ok");
// }
//
// @ApiOperation("Pacs采集接口")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class),
// @ApiImplicitParam(name = "collectSubId",value = "af_interface_collect_sub表id",required = true),
// @ApiImplicitParam(name = "admissDate",value = "入院时间",required = true),
// @ApiImplicitParam(name = "disDate",value = "出院时间",required = true),
// @ApiImplicitParam(name = "times",value = "住院次数",required = true)
// })
// @GetMapping("/collectPacs")
// public CommonResult<String> collect(@RequestParam("collectSubId") String collectSubId,
// @RequestParam("empId") String empId,
// @RequestParam("admissDate") String admissDate,
// @RequestParam("disDate") String disDate,
// @RequestParam("times") String times){
// try {
// logger.info("采集接口接收到参数:\nempId--"+empId+"\ncollectSubId--"+collectSubId);
// bgtsService.collectPacs(empId,admissDate,disDate,times);
// logger.info("采集完成");
// afCollectTaskService.updateInterfaceCollect(collectSubId, 1);
// logger.info("------------采集结束-----------");
// } catch (RuntimeException e) {
// e.printStackTrace();
// try {
// afCollectTaskService.updateInterfaceCollect(collectSubId, 0);
// }catch (Exception e1) {
// logger.info(e1.getMessage());
// return CommonResult.failed(e1.getMessage());
// }
// return CommonResult.failed(e.getMessage());
// }
// catch (Exception e) {
// e.printStackTrace();
// }
// return CommonResult.success("ok");
// }
//
@GetMapping("/addSyncIntegralityByJzhs")
public CommonResult<String> addSyncIntegrality(@RequestParam("jzhs")String jzhs){
if(jzhs.split(",").length > 100){
return CommonResult.failed("jzh个数不能超过100个");
}
checkIntegrityService.addSyncIntegralityByJzhs(jzhs);
return CommonResult.success("完成");
}
// @ApiOperation("动态心电采集接口")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class),
// @ApiImplicitParam(name = "collectSubId",value = "af_interface_collect_sub表id",required = true),
// @ApiImplicitParam(name = "admissDate",value = "入院时间",required = true),
// @ApiImplicitParam(name = "disDate",value = "出院时间",required = true),
// @ApiImplicitParam(name = "times",value = "住院次数",required = true)
// })
// @GetMapping("/collectEcg")
// public CommonResult<String> collectEcg(@RequestParam("collectSubId") String collectSubId,
// @RequestParam("empId") String empId,
// @RequestParam("admissDate") String admissDate,
// @RequestParam("disDate") String disDate,
// @RequestParam("times") String times){
// try {
// logger.info("采集接口接收到参数:\nempId--"+empId+"\ncollectSubId--"+collectSubId);
// bgtsService.collectEcg(empId,admissDate,disDate,times);
// logger.info("采集完成");
// afCollectTaskService.updateInterfaceCollect(collectSubId, 1);
// logger.info("------------采集结束-----------");
// } catch (RuntimeException e) {
// e.printStackTrace();
// try {
// afCollectTaskService.updateInterfaceCollect(collectSubId, 0);
// }catch (Exception e1) {
// logger.info(e1.getMessage());
// return CommonResult.failed(e1.getMessage());
// }
// return CommonResult.failed(e.getMessage());
// }
// catch (Exception e) {
// e.printStackTrace();
// }
// return CommonResult.success("ok");
// }
@ApiOperation("采集接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class),
@ApiImplicitParam(name = "collectSubId",value = "af_interface_collect_sub表id",required = true)
})
@GetMapping("/collect")
public CommonResult<String> collect(@RequestParam("collectSubId") String collectSubId,
@RequestParam("empId") String empId) {
try {
logger.info("采集接口接收到参数:\nempId--"+empId+"\ncollectSubId--"+collectSubId);
bgtsService.collect(empId);
logger.info("采集完成");
afCollectTaskService.updateInterfaceCollect(collectSubId, 1);
logger.info("------------采集结束-----------");
} catch (RuntimeException e) {
e.printStackTrace();
try {
afCollectTaskService.updateInterfaceCollect(collectSubId, 0);
}catch (Exception e1) {
logger.info(e1.getMessage());
return CommonResult.failed(e1.getMessage());
}
return CommonResult.failed(e.getMessage());
}
catch (Exception e) {
e.printStackTrace();
}catch (Throwable t){
t.printStackTrace();
logger.error("throwable{}", t.getMessage());
}
return CommonResult.success("ok");
}
// /**
// * 按需采集
// * @param emamNo
// * @return
// */
// @ApiOperation("按需采集接口")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "emamNo",value = "报告单号",required = true,dataTypeClass = String.class),
// @ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class)
// })
// @GetMapping("/collectByExamNo")
// public CommonResult<String> collectByExamNo(@RequestParam("emamNo") String emamNo,
// @RequestParam("empId") String empId){
// try {
// logger.info("按需采集接口接受参数:\nempId--"+empId+"\nemamNo--"+emamNo);
// bgtsService.collectByExamNo(emamNo,empId);
//// afCollectTaskService.updateInterfaceCollect(collectSubId, 1);
// }catch (RuntimeException e) {
// e.printStackTrace();
// return CommonResult.failed(e.getMessage());
// }
// catch (Exception e) {
// e.printStackTrace();
// }
// return CommonResult.success("ok");
// }
@ApiOperation("Pacs采集接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class),
@ApiImplicitParam(name = "collectSubId",value = "af_interface_collect_sub表id",required = true),
@ApiImplicitParam(name = "admissDate",value = "入院时间",required = true),
@ApiImplicitParam(name = "disDate",value = "出院时间",required = true),
@ApiImplicitParam(name = "times",value = "住院次数",required = true)
})
@GetMapping("/collectPacs")
public CommonResult<String> collect(@RequestParam("collectSubId") String collectSubId,
@RequestParam("empId") String empId,
@RequestParam("admissDate") String admissDate,
@RequestParam("disDate") String disDate,
@RequestParam("times") String times){
try {
logger.info("采集接口接收到参数:\nempId--"+empId+"\ncollectSubId--"+collectSubId);
bgtsService.collectPacs(empId,admissDate,disDate,times);
logger.info("采集完成");
afCollectTaskService.updateInterfaceCollect(collectSubId, 1);
logger.info("------------采集结束-----------");
} catch (RuntimeException e) {
e.printStackTrace();
try {
afCollectTaskService.updateInterfaceCollect(collectSubId, 0);
}catch (Exception e1) {
logger.info(e1.getMessage());
return CommonResult.failed(e1.getMessage());
}
return CommonResult.failed(e.getMessage());
}
catch (Exception e) {
e.printStackTrace();
}
return CommonResult.success("ok");
}
// /**
// * 按需采集
// */
// @GetMapping("/collectByEx")
// public CommonResult<String> collectByEx(@RequestParam("empId") String empId){
// try{
// bgtsService.collect(empId);
// }catch (Exception e){
// e.printStackTrace();
// return CommonResult.failed(e.getMessage());
// }
// return CommonResult.success("ok");
// }
// /**
// * pacs按需采集
// */
// @ApiOperation("pacs按需采集接口")
// @GetMapping("/collectByPacs")
// public CommonResult<String> collectByPacs(){
// try{
// bgtsService.collectPacss();
// }catch (Exception e){
// e.printStackTrace();
// return CommonResult.failed(e.getMessage());
// }
// return CommonResult.success("ok");
// }
@ApiOperation("动态心电采集接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class),
@ApiImplicitParam(name = "collectSubId",value = "af_interface_collect_sub表id",required = true),
@ApiImplicitParam(name = "admissDate",value = "入院时间",required = true),
@ApiImplicitParam(name = "disDate",value = "出院时间",required = true),
@ApiImplicitParam(name = "times",value = "住院次数",required = true)
})
@GetMapping("/collectEcg")
public CommonResult<String> collectEcg(@RequestParam("collectSubId") String collectSubId,
@RequestParam("empId") String empId,
@RequestParam("admissDate") String admissDate,
@RequestParam("disDate") String disDate,
@RequestParam("times") String times){
try {
logger.info("采集接口接收到参数:\nempId--"+empId+"\ncollectSubId--"+collectSubId);
bgtsService.collectEcg(empId,admissDate,disDate,times);
logger.info("采集完成");
afCollectTaskService.updateInterfaceCollect(collectSubId, 1);
logger.info("------------采集结束-----------");
} catch (RuntimeException e) {
e.printStackTrace();
try {
afCollectTaskService.updateInterfaceCollect(collectSubId, 0);
}catch (Exception e1) {
logger.info(e1.getMessage());
return CommonResult.failed(e1.getMessage());
}
return CommonResult.failed(e.getMessage());
}
catch (Exception e) {
e.printStackTrace();
}
return CommonResult.success("ok");
}
/**
*
* @param emamNo
* @return
*/
@ApiOperation("按需采集接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "emamNo",value = "报告单号",required = true,dataTypeClass = String.class),
@ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class)
})
@GetMapping("/collectByExamNo")
public CommonResult<String> collectByExamNo(@RequestParam("emamNo") String emamNo,
@RequestParam("empId") String empId){
try {
logger.info("按需采集接口接受参数:\nempId--"+empId+"\nemamNo--"+emamNo);
bgtsService.collectByExamNo(emamNo,empId);
// afCollectTaskService.updateInterfaceCollect(collectSubId, 1);
}catch (RuntimeException e) {
e.printStackTrace();
return CommonResult.failed(e.getMessage());
}
catch (Exception e) {
e.printStackTrace();
}
return CommonResult.success("ok");
}
/**
*
*/
@GetMapping("/collectByEx")
public CommonResult<String> collectByEx(@RequestParam("empId") String empId){
try{
bgtsService.collect(empId);
}catch (Exception e){
e.printStackTrace();
return CommonResult.failed(e.getMessage());
}
return CommonResult.success("ok");
}
/**
* pacs
*/
@ApiOperation("pacs按需采集接口")
@GetMapping("/collectByPacs")
public CommonResult<String> collectByPacs(){
try{
bgtsService.collectPacss();
}catch (Exception e){
e.printStackTrace();
return CommonResult.failed(e.getMessage());
}
return CommonResult.success("ok");
}
@ApiOperation("手麻根据出院时间区间补偿采集接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "startDate",value = "开始时间",required = true),
@ApiImplicitParam(name = "endDate",value = "结束时间",required = true)
})
@GetMapping("/collectPacsCompensate")
@GetMapping("/collectSmCompensate")
public CommonResult<String> collectSm(
@RequestParam("startDate") String startDate,
@RequestParam("endDate") String endDate){
@ -243,68 +240,68 @@ public class BgtsController {
}
return CommonResult.success("ok");
}
//
// @ApiOperation("Pacs补偿采集接口")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "empId",value = "住院号",required = true,dataTypeClass = String.class),
// @ApiImplicitParam(name = "admissDate",value = "入院时间",required = true),
// @ApiImplicitParam(name = "disDate",value = "出院时间",required = true),
// @ApiImplicitParam(name = "times",value = "住院次数",required = true)
// })
// @GetMapping("/collectPacsCompensate")
// public CommonResult<String> collectPacs(
// @RequestParam("empId") String empId,
// @RequestParam("admissDate") String admissDate,
// @RequestParam("disDate") String disDate,
// @RequestParam("times") String times){
// try {
// logger.info("采集接口接收到参数:\nempId--"+empId);
// bgtsService.collectPacs(empId,admissDate,disDate,times);
// logger.info("采集完成");
// logger.info("------------采集结束-----------");
// } catch (RuntimeException e) {
// e.printStackTrace();
// try {
// }catch (Exception e1) {
// logger.info(e1.getMessage());
// return CommonResult.failed(e1.getMessage());
// }
// return CommonResult.failed(e.getMessage());
// }
// catch (Exception e) {
// e.printStackTrace();
// }
// return CommonResult.success("ok");
// }
//
// @ApiOperation("Pacs根据出院时间区间补偿采集接口")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "startDate",value = "开始时间",required = true),
// @ApiImplicitParam(name = "endDate",value = "结束时间",required = true)
// })
// @GetMapping("/collectPacsByDate")
// public CommonResult<String> collectPacsByDate(
// @RequestParam("startDate") String startDate,
// @RequestParam("endDate") String endDate){
// try {
// logger.info("根据出院时间区间补偿采集接口收到参数:\n"+startDate+"\t"+endDate);
// bgtsService.collectPacsByDate(startDate,endDate);
// logger.info("采集完成");
// logger.info("------------采集结束-----------");
// } catch (RuntimeException e) {
// e.printStackTrace();
// try {
// }catch (Exception e1) {
// logger.info(e1.getMessage());
// return CommonResult.failed(e1.getMessage());
// }
// return CommonResult.failed(e.getMessage());
// }
// catch (Exception e) {
// e.printStackTrace();
// }
// return CommonResult.success("ok");
// }
@ApiOperation("Pacs补偿采集接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "empId",value = "住院号",required = true,dataTypeClass = String.class),
@ApiImplicitParam(name = "admissDate",value = "入院时间",required = true),
@ApiImplicitParam(name = "disDate",value = "出院时间",required = true),
@ApiImplicitParam(name = "times",value = "住院次数",required = true)
})
@GetMapping("/collectPacsCompensate")
public CommonResult<String> collectPacs(
@RequestParam("empId") String empId,
@RequestParam("admissDate") String admissDate,
@RequestParam("disDate") String disDate,
@RequestParam("times") String times){
try {
logger.info("采集接口接收到参数:\nempId--"+empId);
bgtsService.collectPacs(empId,admissDate,disDate,times);
logger.info("采集完成");
logger.info("------------采集结束-----------");
} catch (RuntimeException e) {
e.printStackTrace();
try {
}catch (Exception e1) {
logger.info(e1.getMessage());
return CommonResult.failed(e1.getMessage());
}
return CommonResult.failed(e.getMessage());
}
catch (Exception e) {
e.printStackTrace();
}
return CommonResult.success("ok");
}
@ApiOperation("Pacs根据出院时间区间补偿采集接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "startDate",value = "开始时间",required = true),
@ApiImplicitParam(name = "endDate",value = "结束时间",required = true)
})
@GetMapping("/collectPacsByDate")
public CommonResult<String> collectPacsByDate(
@RequestParam("startDate") String startDate,
@RequestParam("endDate") String endDate){
try {
logger.info("根据出院时间区间补偿采集接口收到参数:\n"+startDate+"\t"+endDate);
bgtsService.collectPacsByDate(startDate,endDate);
logger.info("采集完成");
logger.info("------------采集结束-----------");
} catch (RuntimeException e) {
e.printStackTrace();
try {
}catch (Exception e1) {
logger.info(e1.getMessage());
return CommonResult.failed(e1.getMessage());
}
return CommonResult.failed(e.getMessage());
}
catch (Exception e) {
e.printStackTrace();
}
return CommonResult.success("ok");
}

Loading…
Cancel
Save