下载完关闭流

.idea/artifacts/AcquisitionServer_war.xml

@@ -1,6 +1,12 @@
 <component name="ArtifactManager">
   <artifact type="war" name="AcquisitionServer:war">
     <output-path>$PROJECT_DIR$/target</output-path>
+    <properties id="maven-jee-properties">
+      <options>
+        <module>AcquisitionServer</module>
+        <packaging>war</packaging>
+      </options>
+    </properties>
     <root id="archive" name="filing.war">
       <element id="artifact" artifact-name="AcquisitionServer:war exploded" />
     </root>

.idea/artifacts/AcquisitionServer_war_exploded.xml

@@ -1,6 +1,13 @@
 <component name="ArtifactManager">
   <artifact type="exploded-war" name="AcquisitionServer:war exploded">
     <output-path>$PROJECT_DIR$/target/filing</output-path>
+    <properties id="maven-jee-properties">
+      <options>
+        <exploded>true</exploded>
+        <module>AcquisitionServer</module>
+        <packaging>war</packaging>
+      </options>
+    </properties>
     <root id="root">
       <element id="directory" name="WEB-INF">
         <element id="directory" name="classes">
@@ -65,6 +72,9 @@
           <element id="library" level="project" name="Maven: org.springframework:spring-orm:5.1.8.RELEASE" />
           <element id="library" level="project" name="Maven: org.springframework:spring-aspects:5.1.8.RELEASE" />
           <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.30" />
+          <element id="library" level="project" name="Maven: commons-httpclient:commons-httpclient:3.1" />
+          <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.0.4" />
+          <element id="library" level="project" name="Maven: commons-codec:commons-codec:1.11" />
           <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.4" />
           <element id="library" level="project" name="Maven: jaxen:jaxen:1.1-beta-11" />
           <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" />
@@ -114,6 +124,8 @@
           <element id="library" level="project" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" />
           <element id="library" level="project" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" />
           <element id="library" level="project" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpclient:4.3.5" />
+          <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpcore:4.4.11" />
         </element>
       </element>
       <element id="directory" name="META-INF">

.idea/encodings.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
   </component>
 </project>

src/main/java/com/ann/job/SchedulerAllJob.java

@@ -53,7 +53,7 @@ public class SchedulerAllJob {
          */
         JobDetail jobDetail = JobBuilder.newJob(ScheduledJob.class).withIdentity("job5", "group1").build();
         // 每15s执行一次
-        CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule("0 0/5 * * * ?");
+        CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule("0/1 * * * * ?");
         CronTrigger cronTrigger = TriggerBuilder.newTrigger().withIdentity("job5", "group1").withSchedule(scheduleBuilder).build();
         scheduler.scheduleJob(jobDetail, cronTrigger);
     }

src/main/java/com/ann/service/impl/QueueService.java

@@ -149,10 +149,18 @@ public class QueueService {
                                                             //横杠拼接申请单号
                                                             String applyId = archiveDetail.getApplyId();
                                                             if (!applyId.contains(checkReportIdArr[1])) {
+                                                                //申请单号跟传进来的申请单号一样做覆盖，不一样新增
                                                                 archiveDetail.setApplyId(applyId + "-" + checkReportIdArr[1]);
                                                                 //更新时间
                                                                 archiveDetail.setUpLoadDateTime(date);
-                                                                archiveDetailService.save(archiveDetail);
+                                                                archiveDetailService.delete(archiveDetail.getId());
+                                                                downFlag = true;
+                                                            }
+                                                            if (applyId.contains(checkReportIdArr[1])) {
+                                                                //申请单号跟传进来的申请单号一样做拼接，不一样不拼接
+                                                                archiveDetail.setUpLoadDateTime(date);
+                                                                archiveDetailService.delete(archiveDetail.getId());
+                                                                downFlag = true;
                                                             }
                                                             status = 1;
                                                         }
@@ -179,7 +187,7 @@ public class QueueService {
                                                         //更新时间
                                                         archiveDetail.setUpLoadDateTime(date);
                                                     }
-                                                } else {
+                                                } else if (!Objects.equals(messageDto.getType(), AliasName.RADIATION_REPORT)){
                                                     //非PACS
                                                     // 查询库中是否存在  如果存在就更新
                                                     archiveDetail = archiveDetailService.isExit(archiveMaster.getId(), messageDto.getType(), messageDto.getSource(), messageDto.getApplyId());

src/test/java/com/ann/DemoApplicationTests.java

@@ -1,16 +1,26 @@
 package com.ann;
 
+import com.ann.entity.filing.MessageSubordinate;
+import com.ann.service.MessageSubordinateService;
+import com.ann.service.impl.QueueService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.List;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class DemoApplicationTests {
-
+    @Autowired
+    MessageSubordinateService messageSubordinateService;
+    @Autowired
+    QueueService queueService;
     @Test
     public void contextLoads() {
+
     }
 
 }