系统优化

api-admin/src/main/java/com/glxp/sale/admin/config/HdSchemaExecutor.java

@@ -74,7 +74,7 @@ public class HdSchemaExecutor implements ApplicationRunner {
     }
 
     public void buildSchemas() {
-//        schema.add(new SchemaData("v2.1", "schema_v2.1.sql"));
+        schema.add(new SchemaData("v2.1", "schema_v2.1.sql"));
 //        schema.add(new SchemaData("v2.2", "schema_v2.2.sql"));
 //        schema.add(new SchemaData("v2.3", "schema_v2.3.sql"));
     }

api-admin/src/main/java/com/glxp/sale/admin/controller/sync/BasicDownloadController.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.glxp.sale.admin.constant.BasicProcessStatus;
 import com.glxp.sale.admin.entity.sync.BasicExportStatusEntity;
+import com.glxp.sale.admin.http.SpGetHttp;
 import com.glxp.sale.admin.req.info.DeleteRequest;
 import com.glxp.sale.admin.req.sync.BasicExportStatusRequest;
 import com.glxp.sale.admin.res.sync.*;
@@ -31,6 +32,8 @@ public class BasicDownloadController {
     BasicExportService basicExportService;
     @Resource
     RedisUtil redisUtil;
+    @Resource
+    SpGetHttp spGetHttp;
 
 
     @GetMapping("/spssync/basic/udiinfo/getStatus")
@@ -49,6 +52,20 @@ public class BasicDownloadController {
     public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) {
 
 //        boolean b = basicExportService.deleteById(deleteRequest.getId());
+
+
+        BasicExportStatusEntity basicExportStatusEntity = basicExportService.findById(deleteRequest.getId());
+        basicExportStatusEntity.setReceiveStatus("处理成功");
+        basicExportService.updateExportStatus(basicExportStatusEntity);
+
+        //更新自助平台状态
+
+
+        BasicExportStatusEntity postEntity = new BasicExportStatusEntity();
+        postEntity.setId(basicExportStatusEntity.getTaskId());
+        postEntity.setReceiveStatus(basicExportStatusEntity.getReceiveStatus());
+        spGetHttp.postUpdateBasicStatus(postEntity);
+
         redisUtil.del(deleteRequest.getId());
         return ResultVOUtils.success("删除成功！");
     }

api-admin/src/main/java/com/glxp/sale/admin/entity/sync/BasicExportStatusEntity.java

@@ -24,4 +24,5 @@ public class BasicExportStatusEntity {
     private String superiorService; //上游服务
     private String subordinateService; //下游服务
     private String cacheFilePath;
+    private String receiveStatus;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/sync/BasicExportStatusRequest.java

@@ -11,4 +11,5 @@ public class BasicExportStatusRequest extends ListPageRequest {
     private Integer scheduleType;
     private String idDatas;
     private String taskId;
+    private String receiveStatus;
 }

api-admin/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml

@@ -31,7 +31,7 @@
     <insert id="insertExportStatus" keyProperty="id"
             parameterType="com.glxp.sale.admin.entity.sync.BasicExportStatusEntity">
         replace
-        INTO basic_export_status(id,taskId,idDatas,status,`type`,transportType,updateTime,scheduleType,startTime,endTime,remark,superiorService,subordinateService,cacheFilePath)
+        INTO basic_export_status(id,taskId,idDatas,status,`type`,transportType,updateTime,scheduleType,startTime,endTime,remark,superiorService,subordinateService,cacheFilePath,receiveStatus)
         values(
         #{id},
         #{taskId},
@@ -46,7 +46,8 @@
         #{remark},
         #{superiorService},
         #{subordinateService},
-        #{cacheFilePath}
+        #{cacheFilePath},
+        #{receiveStatus}
         )
     </insert>
 
@@ -66,6 +67,7 @@
             <if test="superiorService != null">superiorService=#{superiorService},</if>
             <if test="subordinateService != null">subordinateService=#{subordinateService},</if>
             <if test="cacheFilePath != null">cacheFilePath=#{cacheFilePath},</if>
+            <if test="receiveStatus != null">receiveStatus=#{receiveStatus},</if>
         </trim>
         WHERE id = #{id}
     </update>

api-admin/src/main/resources/schemas/schema_v2.1.sql

@@ -0,0 +1 @@
+CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ', 1);