diff --git a/pom.xml b/pom.xml index 0795ca7..d45e406 100644 --- a/pom.xml +++ b/pom.xml @@ -17,10 +17,6 @@ 1.8 - - org.springframework.boot - spring-boot-starter - org.dom4j diff --git a/src/main/java/com/docus/bgts/config/MyScheduling.java b/src/main/java/com/docus/bgts/config/MyScheduling.java index 4251685..5714c2e 100644 --- a/src/main/java/com/docus/bgts/config/MyScheduling.java +++ b/src/main/java/com/docus/bgts/config/MyScheduling.java @@ -1,25 +1,18 @@ package com.docus.bgts.config; -import com.alibaba.fastjson.JSON; -import com.docus.bgts.entity.ReportDownDto; -import com.docus.bgts.entity.ReportDownPatientDto; -import com.docus.bgts.entity.ReportDownScanFileDto; -import com.docus.bgts.enums.Codes; + import com.docus.bgts.facade.IAfCollectTaskService; import com.docus.bgts.facade.IMrReportErrorService; import com.docus.bgts.utils.FileUtils; import com.docus.bgts.utils.HttpUtils; -import com.docus.bgts.utils.XmlUtils; + import lombok.extern.slf4j.Slf4j; import org.apache.axis.client.Call; import org.apache.axis.encoding.XMLType; import org.apache.axis.utils.ByteArrayOutputStream; -import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import org.dom4j.Element; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; @@ -27,7 +20,7 @@ import org.springframework.stereotype.Component; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; -import java.io.ByteArrayInputStream; + import java.io.PrintStream; import java.net.URISyntaxException; import java.text.ParseException; @@ -66,7 +59,8 @@ public class MyScheduling { @Value("${beat.url}") private String beatUrl; - private Logger logger = LogManager.getLogger(MyScheduling.class); + + private final Logger logger = LoggerFactory.getLogger(getClass()); //10分钟执行一次 @Scheduled(fixedRate = 1000 * 60 * 5) diff --git a/src/main/java/com/docus/bgts/handler/TBasicWebService.java b/src/main/java/com/docus/bgts/handler/TBasicWebService.java index adc6f10..29d9bad 100644 --- a/src/main/java/com/docus/bgts/handler/TBasicWebService.java +++ b/src/main/java/com/docus/bgts/handler/TBasicWebService.java @@ -11,12 +11,13 @@ import com.docus.bgts.utils.HttpUtils; import com.docus.bgts.utils.ResultUtils; import com.docus.bgts.utils.XmlUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; + import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.Element; import org.dom4j.io.SAXReader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import javax.jws.WebService; @@ -34,7 +35,8 @@ public class TBasicWebService implements ITBasicWebService { @Autowired IMrReportErrorService mrReportErrorService; - private Logger logger = LogManager.getLogger(TBasicWebService.class); + + private final Logger logger = LoggerFactory.getLogger(getClass()); private Element getElementFromString(String s) { SAXReader builder = new SAXReader(); diff --git a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java index 6808822..1f633a9 100644 --- a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java +++ b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java @@ -13,13 +13,11 @@ import com.docus.bgts.mapper.AfInterfaceCollectSubMapper; import com.docus.bgts.utils.FileUtils; import com.docus.bgts.utils.HttpUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - -import java.io.UnsupportedEncodingException; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -36,7 +34,7 @@ import java.util.Map; @Service public class AfCollectTaskServiceImpl extends ServiceImpl implements IAfCollectTaskService { - private Logger log = LogManager.getLogger(); + private final Logger log = LoggerFactory.getLogger(getClass()); @Autowired AfCollectTaskMapper afCollectTaskMapper;