From 33f38638fc938ce59d11f6e8b40e72c6fc4ce908 Mon Sep 17 00:00:00 2001 From: x_z Date: Sat, 11 Jun 2022 17:27:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E4=B8=8B=E8=BD=BD=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=92=8C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/admin/constant/ConstantStatus.java | 9 ++ .../basic/SpsSyncDownloadController.java | 82 +++++++++++++ .../api/admin/dao/basic/BasicDownloadDao.java | 23 ++++ .../admin/req/basic/BasicDownloadRequest.java | 15 +++ .../admin/res/basic/SpSyncUdiResponse.java | 2 + .../admin/res/basic/SpsSyncBusResponse.java | 2 + .../admin/res/basic/SpsSyncDataResponse.java | 2 + .../admin/res/basic/SpsSyncOrderResponse.java | 2 + .../service/basic/BasicDownloadService.java | 19 +++ .../basic/impl/BasicDownloadServiceImpl.java | 59 +++++++++ .../glxp/api/admin/thread/DlBasicService.java | 114 ++++++++++++++++-- .../mybatis/mapper/basic/BasicDownloadDao.xml | 66 ++++++++++ 12 files changed, 385 insertions(+), 10 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncDownloadController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicDownloadDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicDownloadRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicDownloadService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicDownloadServiceImpl.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java index 506a59a1..7a9bb85e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java +++ b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java @@ -128,4 +128,13 @@ public class ConstantStatus { public static final String SYNC_BASIC_DATA = "AutoUploadAllData"; public static final String SYNC_BUS_TYPE = "AutoUploadBusType"; public static final String SYNC_SCAN_ORDER = "AutoUploadOrder"; + + //自动下载所有数据 + public static final String SYNC_DOWNLOAD_BASIC_DATA = "AutoDownloadAllData"; + //自动下载单据数据 + public static final String SYNC_DOWNLOAD_BUS_TYPE = "AutoDownloadBusType"; + //自动下载单据数据 + public static final String SYNC_DOWNLOAD_SCAN_ORDER = "AutoDownloadOrder"; + //自动下载DI数据 + public static final String SYNC_DOWNLOAD_DI = "AutoDownloadDI"; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncDownloadController.java new file mode 100644 index 00000000..732c1eba --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncDownloadController.java @@ -0,0 +1,82 @@ +package com.glxp.api.admin.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.basic.BasicDownloadStatusEntity; +import com.glxp.api.admin.httpclient.SpGetHttpClient; +import com.glxp.api.admin.req.basic.BasicDownloadRequest; +import com.glxp.api.admin.req.info.DeleteRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.basic.BasicDownloadService; +import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +@Slf4j +@RestController +public class SpsSyncDownloadController { + + @Resource + BasicDownloadService basicDownloadService; + @Resource + RedisUtil redisUtil; + @Resource + SpGetHttpClient spGetHttp; + + @GetMapping("/spssync/download/basic/udiinfo/getStatus") + public BaseResponse getStatus(BasicDownloadRequest basicDownloadRequest) { + List basicDownloadStatusEntities = basicDownloadService.filterDownloadStatus(basicDownloadRequest); + return ResultVOUtils.success(basicDownloadStatusEntities); + } + + @GetMapping("/spssync/download/basic/udiinfo/filter") + public BaseResponse filterStatus(BasicDownloadRequest basicDownloadRequest) { + List basicDownloadStatusEntities = basicDownloadService.filterDownloadStatus(basicDownloadRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicDownloadStatusEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicDownloadStatusEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/spssync/download/basic/udiinfo/deleteByStatus") + public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) { + + boolean b = basicDownloadService.deleteById(deleteRequest.getId()); + redisUtil.del(deleteRequest.getId()); + if (b) + return ResultVOUtils.success("删除成功！"); + else + return ResultVOUtils.error(500, "删除失败！"); + } + + @PostMapping("/spssync/download/basic/udiinfo/updateStatus") + public BaseResponse updateStatus(@RequestBody BasicDownloadStatusEntity basicDownloadStatusEntity) { + + basicDownloadStatusEntity.setEndTime(new Date()); + basicDownloadStatusEntity.setUpdateTime(new Date()); + boolean b = basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); + if (b) + return ResultVOUtils.success("更新成功！"); + else + return ResultVOUtils.error(500, "更新成功！"); + } + + @GetMapping("/spssync/download/basic/connect/test") + public BaseResponse testConnect() { + return spGetHttp.testConnect(); + + } + + +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicDownloadDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicDownloadDao.java new file mode 100644 index 00000000..d0a5f56d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicDownloadDao.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.BasicDownloadStatusEntity; +import com.glxp.api.admin.req.basic.BasicDownloadRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BasicDownloadDao { + + + List filterDownloadStatus(BasicDownloadRequest basicDownloadRequest); + + boolean insertDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity); + + boolean deleteById(@Param("id") String id); + + boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicDownloadRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicDownloadRequest.java new file mode 100644 index 00000000..dddbfe31 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicDownloadRequest.java @@ -0,0 +1,15 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class BasicDownloadRequest extends ListPageRequest { + private String id; + private Integer status; + private Integer type; + private String idDatas; + private Integer scheduleType; + public Integer createType; + private String syncTime; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpSyncUdiResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpSyncUdiResponse.java index 8ce3f534..6b127904 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpSyncUdiResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpSyncUdiResponse.java @@ -9,6 +9,8 @@ import java.util.List; @Data public class SpSyncUdiResponse { + //同步任务ID + private String taskId; List productInfoEntityList; List udiCompanyEntities; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java index 1691acce..7523e245 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java @@ -8,6 +8,8 @@ import java.util.List; @Data public class SpsSyncBusResponse { + //同步任务ID + private String taskId; private List bussinessTypeEntities; private List bussinessOriginTypeEntities; private List bussinessLocalTypeEntities; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java index f2d159d7..e2743888 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java @@ -16,6 +16,8 @@ import java.util.List; @Data public class SpsSyncDataResponse { + //同步任务ID + private String taskId; List invWarehouseEntities; List udiInfoEntities; List basicUnitMaintainEntities; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java index 20e9399d..0265da7e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java @@ -10,6 +10,8 @@ import java.util.List; @Data public class SpsSyncOrderResponse { + //同步任务ID + private String taskId; List orderEntities; List orderDetailEntityList; List warehouseEntityList; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicDownloadService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicDownloadService.java new file mode 100644 index 00000000..287b1e3a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicDownloadService.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.service.basic; + +import com.glxp.api.admin.entity.basic.BasicDownloadStatusEntity; +import com.glxp.api.admin.req.basic.BasicDownloadRequest; + +import java.util.List; + +public interface BasicDownloadService { + + BasicDownloadStatusEntity findByData(String idDatas, Integer status); + + List filterDownloadStatus(BasicDownloadRequest basicDownloadRequest); + + boolean insertDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity); + + boolean deleteById(String id); + + boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicDownloadServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicDownloadServiceImpl.java new file mode 100644 index 00000000..01ee543f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicDownloadServiceImpl.java @@ -0,0 +1,59 @@ +package com.glxp.api.admin.service.basic.impl; + +import cn.hutool.core.collection.CollUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.BasicDownloadDao; +import com.glxp.api.admin.entity.basic.BasicDownloadStatusEntity; +import com.glxp.api.admin.req.basic.BasicDownloadRequest; +import com.glxp.api.admin.service.basic.BasicDownloadService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class BasicDownloadServiceImpl implements BasicDownloadService { + + @Resource + BasicDownloadDao basicDownloadDao; + + @Override + public BasicDownloadStatusEntity findByData(String idDatas, Integer status) { + BasicDownloadRequest basicDownloadRequest = new BasicDownloadRequest(); + basicDownloadRequest.setStatus(status); + basicDownloadRequest.setIdDatas(idDatas); + List basicDownloadStatusEntities = basicDownloadDao.filterDownloadStatus(basicDownloadRequest); + if (CollUtil.isNotEmpty(basicDownloadStatusEntities)) { + return basicDownloadStatusEntities.get(0); + } + return null; + } + + @Override + public List filterDownloadStatus(BasicDownloadRequest basicDownloadRequest) { + if (basicDownloadRequest == null) { + return Collections.emptyList(); + } + if (basicDownloadRequest.getPage() != null) { + int offset = (basicDownloadRequest.getPage() - 1) * basicDownloadRequest.getLimit(); + PageHelper.offsetPage(offset, basicDownloadRequest.getLimit()); + } + return basicDownloadDao.filterDownloadStatus(basicDownloadRequest); + } + + @Override + public boolean insertDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity) { + return basicDownloadDao.insertDownloadStatus(basicDownloadStatusEntity); + } + + @Override + public boolean deleteById(String id) { + return basicDownloadDao.deleteById(id); + } + + @Override + public boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity) { + return basicDownloadDao.updateDownloadStatus(basicDownloadStatusEntity); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java index 5340a534..eec903e2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java @@ -7,26 +7,34 @@ import com.glxp.api.admin.constant.BasicProcessStatus; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.dao.auth.AuthAdminDao; import com.glxp.api.admin.dao.basic.*; -import com.glxp.api.admin.dao.inout.*; +import com.glxp.api.admin.dao.inout.CodesTempDao; +import com.glxp.api.admin.dao.inout.OrderDao; +import com.glxp.api.admin.dao.inout.WarehouseBussinessTypeDao; +import com.glxp.api.admin.dao.inout.WarehouseUserDao; import com.glxp.api.admin.dao.thrsys.ThrCorpDao; import com.glxp.api.admin.dao.thrsys.ThrOrderDao; import com.glxp.api.admin.dao.thrsys.ThrOrderDetailDao; import com.glxp.api.admin.dao.thrsys.ThrProductsDao; import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.basic.*; -import com.glxp.api.admin.entity.inout.*; +import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.entity.inout.WarehouseUserEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.entity.thrsys.*; +import com.glxp.api.admin.httpclient.SpGetHttpClient; import com.glxp.api.admin.req.basic.BasicExportStatusRequest; -import com.glxp.api.admin.res.basic.*; -import com.glxp.api.admin.service.auth.AuthAdminService; +import com.glxp.api.admin.res.basic.SpSyncUdiResponse; +import com.glxp.api.admin.res.basic.SpsSyncBusResponse; +import com.glxp.api.admin.res.basic.SpsSyncDataResponse; +import com.glxp.api.admin.res.basic.SpsSyncOrderResponse; +import com.glxp.api.admin.service.basic.BasicDownloadService; import com.glxp.api.admin.service.basic.BussinessChangeTypeService; -import com.glxp.api.admin.service.basic.UdiInfoImportDetailService; import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.admin.service.inventory.InvWarehouseService; import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService; import com.glxp.api.admin.util.RedisUtil; -import com.glxp.api.admin.httpclient.SpGetHttpClient; import com.glxp.api.common.res.BaseResponse; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; @@ -68,6 +76,8 @@ public class DlBasicService { ThrInvWarehouseService thrInvWarehouseService; @Resource BussinessChangeTypeService bussinessChangeTypeService; + @Resource + private BasicDownloadService basicDownloadService; private static final Logger logger = LoggerFactory.getLogger(DlBasicService.class); //------------------------------------------------------------ @@ -82,8 +92,22 @@ public class DlBasicService { String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_DATA); BaseResponse response = JSONObject.parseObject(datas, new TypeReference>() { }); + if (response.getCode() == 20000 && response.getData() != null) { SpsSyncDataResponse syncDataResponse = response.getData(); + + //构造下载记录 + BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); + basicDownloadStatusEntity.setId(syncDataResponse.getTaskId()); + basicDownloadStatusEntity.setStartTime(new Date()); + basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_BASIC_DATA); + basicDownloadStatusEntity.setStatus(0); //下载中 + basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_DATA); + basicDownloadStatusEntity.setScheduleType(1); + + basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); + StringBuffer remark = new StringBuffer(); + SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); //仓库字典导入 if (CollUtil.isNotEmpty(syncDataResponse.getInvWarehouseEntities())) { @@ -93,6 +117,7 @@ public class DlBasicService { } invWarehouseService.importInvWarehouse(syncDataResponse.getInvWarehouseEntities()); + remark.append("仓库字典：").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n"); } //关联表导入 @@ -118,6 +143,7 @@ public class DlBasicService { mapper.insertUdiInfo(udiInfoEntity); } batchSession.commit(); + remark.append("耗材字典：").append(syncDataResponse.getUdiInfoEntities().size()).append("条\n"); } catch (Exception e) { } } @@ -133,6 +159,7 @@ public class DlBasicService { mapper.importBasicUnitMaintain(basicUnitMaintainEntity); } batchSession.commit(); + remark.append("往来单位：").append(syncDataResponse.getBasicUnitMaintainEntities().size()).append("条\n"); } catch (Exception e) { } } @@ -163,6 +190,7 @@ public class DlBasicService { mapper.insertThrProducts(thrProductsEntity); } batchSession.commit(); + remark.append("第三方产品信息：").append(syncDataResponse.getThrProductsEntities().size()).append("条\n"); } catch (Exception e) { } } @@ -178,6 +206,7 @@ public class DlBasicService { mapper.importThrCorp(thrCorpEntity); }); batchSession.commit(); + remark.append("第三方往来单位信息：").append(syncDataResponse.getThrCorpEntities().size()).append("条\n"); } catch (Exception e) { } } @@ -192,6 +221,7 @@ public class DlBasicService { mapper.importThrOrder(thrCorpEntity); }); batchSession.commit(); + remark.append("第三方业务单据：").append(syncDataResponse.getThrOrderEntities().size()).append("条\n"); } catch (Exception e) { } } @@ -205,6 +235,7 @@ public class DlBasicService { mapper.importThrOrderDetail(thrOrderDetailEntity); }); batchSession.commit(); + remark.append("第三方业务单据详情：").append(syncDataResponse.getThrOrderDetailEntities().size()).append("条\n"); } catch (Exception e) { } } @@ -215,6 +246,7 @@ public class DlBasicService { invWarehouseEntity.setUpdateTime(null); } thrInvWarehouseService.insertInvWarehouses(syncDataResponse.getThrInvWarehouseEntities()); + remark.append("第三方仓库信息：").append(syncDataResponse.getThrInvWarehouseEntities().size()).append("条\n"); } @@ -223,6 +255,7 @@ public class DlBasicService { for (WarehouseUserEntity warehouseUserEntity : syncDataResponse.getWarehouseUserEntities()) { warehouseUserDao.insertOrUpdate(warehouseUserEntity); } + remark.append("仓库用户：").append(syncDataResponse.getWarehouseUserEntities().size()).append("条\n"); } //仓库单据类型表 @@ -230,6 +263,7 @@ public class DlBasicService { for (WarehouseBussinessTypeEntity warehouseUserEntity : syncDataResponse.getWarehouseBussinessTypeEntities()) { warehouseBussinessTypeDao.insertOrUpdate(warehouseUserEntity); } + remark.append("仓库单据：").append(syncDataResponse.getWarehouseBussinessTypeEntities().size()).append("条\n"); } //用户表 @@ -238,13 +272,16 @@ public class DlBasicService { authAdmin.setLastModifyTime(null); authAdminService.replaceAuthAdmin(authAdmin); } + remark.append("用户：").append(syncDataResponse.getAuthAdminList().size()).append("条\n"); } spGetHttp.postBasicStatus(basicExportStatusEntity.getId()); batchSession.close(); - - + basicDownloadStatusEntity.setUpdateTime(new Date()); + basicDownloadStatusEntity.setEndTime(new Date()); + basicDownloadStatusEntity.setRemark(remark.toString()); + basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); } } } @@ -264,6 +301,19 @@ public class DlBasicService { }); if (response.getCode() == 20000 && response.getData() != null) { SpsSyncBusResponse syncDataResponse = response.getData(); + + //构造下载记录 + BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); + basicDownloadStatusEntity.setId(syncDataResponse.getTaskId()); + basicDownloadStatusEntity.setStartTime(new Date()); + basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_BUS_TYPE); + basicDownloadStatusEntity.setStatus(0); //下载中 + basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_BUS); + basicDownloadStatusEntity.setScheduleType(1); + + basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); + StringBuffer remark = new StringBuffer(); + SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); //扫码单据 @@ -276,6 +326,7 @@ public class DlBasicService { mapper.insertBussinessType(bussinessTypeEntity); } batchSession.commit(); + remark.append("扫码单据类型：").append(syncDataResponse.getBussinessTypeEntities().size()).append("条\n"); } catch (Exception e) { logger.error(e.getMessage()); } @@ -299,6 +350,7 @@ public class DlBasicService { bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity); } } + remark.append("业务单据类型：").append(syncDataResponse.getBussinessLocalTypeEntities().size()).append("条\n"); } catch (Exception e) { logger.error(e.getMessage()); } @@ -313,12 +365,19 @@ public class DlBasicService { mapper.insertBusOriginType(bussinessTypeEntity); } batchSession.commit(); + remark.append("第三方单据类型：").append(syncDataResponse.getBussinessOriginTypeEntities().size()).append("条\n"); } catch (Exception e) { logger.error(e.getMessage()); } } batchSession.close(); spGetHttp.postBasicStatus(basicExportStatusEntity.getId()); + + basicDownloadStatusEntity.setUpdateTime(new Date()); + basicDownloadStatusEntity.setEndTime(new Date()); + basicDownloadStatusEntity.setRemark(remark.toString()); + + basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); } } } @@ -339,6 +398,18 @@ public class DlBasicService { }); if (response.getCode() == 20000 && response.getData() != null) { SpsSyncOrderResponse syncDataResponse = response.getData(); + + BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); + basicDownloadStatusEntity.setId(syncDataResponse.getTaskId()); + basicDownloadStatusEntity.setStartTime(new Date()); + basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_SCAN_ORDER); + basicDownloadStatusEntity.setStatus(0); //下载中 + basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_ORDER); + basicDownloadStatusEntity.setScheduleType(1); + + basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); + StringBuffer remark = new StringBuffer(); + SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) { try { @@ -371,11 +442,17 @@ public class DlBasicService { } batchSession.commit(); + remark.append("单据：").append(syncDataResponse.getOrderEntities().size()).append("条\n"); } catch (Exception e) { } } batchSession.close(); spGetHttp.postBasicStatus(basicExportStatusEntity.getId()); + + basicDownloadStatusEntity.setUpdateTime(new Date()); + basicDownloadStatusEntity.setEndTime(new Date()); + basicDownloadStatusEntity.setRemark(remark.toString()); + basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); } } } @@ -410,7 +487,6 @@ public class DlBasicService { public void dlAllUDI() { - BaseResponse> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_DI + ""); List pageSimpleResponse = baseResponse.getData(); if (pageSimpleResponse != null) { @@ -423,6 +499,18 @@ public class DlBasicService { }); if (response.getCode() == 20000 && response.getData() != null) { SpSyncUdiResponse spSyncUdiResponse = response.getData(); + + BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); + basicDownloadStatusEntity.setId(spSyncUdiResponse.getTaskId()); + basicDownloadStatusEntity.setStartTime(new Date()); + basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_DI); + basicDownloadStatusEntity.setStatus(0); //下载中 + basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_DI); + basicDownloadStatusEntity.setScheduleType(1); + + basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); + StringBuffer remark = new StringBuffer(); + SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); if (CollUtil.isNotEmpty(spSyncUdiResponse.getUdiCompanyEntities())) { List udiCompanyEntities = spSyncUdiResponse.getUdiCompanyEntities(); @@ -431,6 +519,7 @@ public class DlBasicService { mapper.insertUdiCompany(udiCompanyEntity); } batchSession.commit(); + remark.append("公司信息：").append(spSyncUdiResponse.getUdiCompanyEntities().size()).append("条\n"); } if (CollUtil.isNotEmpty(spSyncUdiResponse.getProductInfoEntityList())) { @@ -440,9 +529,15 @@ public class DlBasicService { mapper.insertProductInfo(productInfoEntity); } batchSession.commit(); + remark.append("产品信息：").append(spSyncUdiResponse.getProductInfoEntityList().size()).append("条\n"); } batchSession.close(); spGetHttp.postBasicStatus(basicExportStatusEntity.getId()); + + basicDownloadStatusEntity.setUpdateTime(new Date()); + basicDownloadStatusEntity.setEndTime(new Date()); + basicDownloadStatusEntity.setRemark(remark.toString()); + basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); } } @@ -450,7 +545,6 @@ public class DlBasicService { } - } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml new file mode 100644 index 00000000..a976fdb3 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml @@ -0,0 +1,66 @@ + + + + + + + + + + replace + INTO basic_download_status(id,idDatas,status,type,updateTime,scheduleType,startTime,endTime,remark) + values( + #{id}, + #{idDatas}, + #{status}, + #{type}, + #{updateTime}, + #{scheduleType}, + #{startTime}, + #{endTime},#{remark} + ) + + + + UPDATE basic_download_status + + idDatas=#{idDatas}, + status=#{status}, + type=#{type}, + updateTime=#{updateTime}, + scheduleType=#{scheduleType}, + startTime=#{startTime}, + endTime=#{endTime}, + remark=#{remark}, + + WHERE id = #{id} + + + DELETE + FROM basic_download_status + WHERE id = #{id} + + + \ No newline at end of file