bug修复

pom.xml

@@ -54,12 +54,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
+<!--        <dependency>-->
-            <groupId>javax.servlet</groupId>
+<!--            <groupId>javax.servlet</groupId>-->
-            <artifactId>javax.servlet-api</artifactId>
+<!--            <artifactId>javax.servlet-api</artifactId>-->
-            <version>3.1.0</version>
+<!--            <version>3.1.0</version>-->
-            <scope>provided</scope>
+<!--            <scope>provided</scope>-->
-        </dependency>
+<!--        </dependency>-->
         <!--让配置文件有提示-->
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java

@@ -159,7 +159,7 @@ public class SpsSyncDownloadController {
         BaseResponse<RelaySyncResponse> baseResponse = new BaseResponse<>();
         BasicExportStatusEntity one = basicExportService.getOne(Wrappers.lambdaQuery(BasicExportStatusEntity.class)
                 .eq(BasicExportStatusEntity::getType, exportType.getRemark())
-                .orderByAsc(BasicExportStatusEntity::getStartTime)
+                .orderByDesc(BasicExportStatusEntity::getStartTime)
                 .last("limit 1")
         );
         RelaySyncResponse relaySyncResponse = null;

src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java

@@ -150,7 +150,7 @@ public class SpsSyncExportStatusController {
     }
 
     @AuthRuleAnnotation("")
-    @PostMapping("/spssync/basic/udiinfo/finishTask")
+    @PostMapping("/spssync/udiinfo/finishTask")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     public BaseResponse finishTask(@RequestBody BasicExportStatusEntity basicExportStatusEntity) {
 
@@ -176,6 +176,31 @@ public class SpsSyncExportStatusController {
             return ResultVOUtils.error(500, "更新成功！");
     }
 
+    @AuthRuleAnnotation("")
+    @PostMapping("/spssync/udiinfo/receiveTask")
+    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
+    public BaseResponse receiveTask(@RequestBody BasicExportStatusEntity basicExportStatusEntity) {
+
+        if (StrUtil.isBlank(basicExportStatusEntity.getId())) {
+            return ResultVOUtils.error(500, "缺少唯一标识！");
+        }
+        if (StrUtil.isEmpty(basicExportStatusEntity.getReceiveStatus())) {
+            basicExportStatusEntity.setEndTime(new Date());
+        }
+        basicExportStatusEntity.setUpdateTime(new Date());
+        basicExportStatusEntity.setStatus(BasicExportStatusEnum.COMPLETED.getCode());
+        boolean b = basicExportService.update(Wrappers.lambdaUpdate(BasicExportStatusEntity.class)
+                .set(BasicExportStatusEntity::getUpdateTime, new Date())
+                .set(BasicExportStatusEntity::getReceiveStatus, 1)
+                .eq(BasicExportStatusEntity::getId, basicExportStatusEntity.getId())
+                .eq(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.COMPLETED.getCode())
+        );
+        if (b)
+            return ResultVOUtils.success("更新成功！");
+        else
+            return ResultVOUtils.error(500, "更新成功！");
+    }
+
 
     @AuthRuleAnnotation("")
     @GetMapping("/spssync/basic/schedule/lastTime")