diff --git a/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java index e4b1c5a..e0418de 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java @@ -117,4 +117,5 @@ public class ConstantStatus { public static final String SYNC_SCAN_ORDER = "AutoDownloadOrder"; public static final String SYNC_DI_PRODUCTS = "AutoDownloadDiProducts"; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java index 90c868e..d32ea4e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java @@ -9,7 +9,6 @@ import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; import com.glxp.sale.admin.res.basic.SpsSyncDataResponse; import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse; import com.glxp.sale.admin.service.basic.BasicExportService; -import com.glxp.sale.admin.util.Constant; import com.glxp.sale.common.res.BaseResponse; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -52,8 +51,11 @@ public class SpsSyncDownloadController { logs = logs + "系统用户信息：" + baseResponse.getData().getAuthAdminList().size() + "条\n"; basicExportStatusEntity.setRemark(logs); basicExportService.updateExportStatus(basicExportStatusEntity); - } + SpsSyncDataResponse syncDataResponse = baseResponse.getData(); + syncDataResponse.setTaskId(basicExportStatusEntity.getId()); + baseResponse.setData(syncDataResponse); + } return baseResponse; } @@ -74,6 +76,10 @@ public class SpsSyncDownloadController { logs = logs + "委托验收设置：" + baseResponse.getData().getEntrustReceEntities().size() + "条\n"; basicExportStatusEntity.setRemark(logs); basicExportService.updateExportStatus(basicExportStatusEntity); + + SpsSyncBusResponse spsSyncBusResponse = baseResponse.getData(); + spsSyncBusResponse.setTaskId(basicExportStatusEntity.getId()); + baseResponse.setData(spsSyncBusResponse); } return baseResponse; } @@ -87,6 +93,10 @@ public class SpsSyncDownloadController { logs = logs + "单据：" + baseResponse.getData().getOrderEntities().size() + "条\n"; basicExportStatusEntity.setRemark(logs); basicExportService.updateExportStatus(basicExportStatusEntity); + + SpsSyncOrderResponse spsSyncOrderResponse = baseResponse.getData(); + spsSyncOrderResponse.setTaskId(basicExportStatusEntity.getId()); + baseResponse.setData(spsSyncOrderResponse); } return baseResponse; } @@ -106,6 +116,10 @@ public class SpsSyncDownloadController { logs = logs + "医疗器械注册人：" + baseResponse.getData().getUdiCompanyEntities().size() + "条\n"; basicExportStatusEntity.setRemark(logs); basicExportService.updateExportStatus(basicExportStatusEntity); + + SpSyncUdiResponse spSyncUdiResponse = baseResponse.getData(); + spSyncUdiResponse.setTaskId(basicExportStatusEntity.getId()); + baseResponse.setData(spSyncUdiResponse); } return baseResponse; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadStatusController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadStatusController.java new file mode 100644 index 0000000..2b412a8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadStatusController.java @@ -0,0 +1,73 @@ +package com.glxp.sale.admin.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.basic.BasicDownloadStatusEntity; +import com.glxp.sale.admin.req.basic.BasicDownloadRequest; +import com.glxp.sale.admin.req.inout.DeleteRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.basic.BasicDownloadService; +import com.glxp.sale.admin.util.RedisUtil; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.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 SpsSyncDownloadStatusController { + + @Resource + BasicDownloadService basicDownloadService; + @Resource + RedisUtil redisUtil; + + @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, "更新成功！"); + } + + +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java index f97bbb2..1042473 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java @@ -1,33 +1,33 @@ package com.glxp.sale.admin.controller.basic; import cn.hutool.core.collection.CollUtil; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.dao.auth.AuthAdminDao; import com.glxp.sale.admin.dao.basic.*; import com.glxp.sale.admin.dao.info.CompanyProductRelevanceDao; -import com.glxp.sale.admin.dao.inout.*; +import com.glxp.sale.admin.dao.inout.CodesTempDao; +import com.glxp.sale.admin.dao.inout.OrderDao; +import com.glxp.sale.admin.dao.inout.WarehouseBussinessTypeDao; +import com.glxp.sale.admin.dao.inout.WarehouseUserDao; import com.glxp.sale.admin.dao.thrsys.*; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.*; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; -import com.glxp.sale.admin.entity.inout.*; +import com.glxp.sale.admin.entity.inout.OrderEntity; +import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.sale.admin.entity.inout.WarehouseEntity; +import com.glxp.sale.admin.entity.inout.WarehouseUserEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.thrsys.*; -import com.glxp.sale.admin.req.basic.SpsSyncDataRequest; import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; import com.glxp.sale.admin.res.basic.SpsSyncDataResponse; import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse; -import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; +import com.glxp.sale.admin.service.basic.BasicDownloadService; import com.glxp.sale.admin.service.basic.BussinessChangeTypeService; import com.glxp.sale.admin.service.basic.EntrustReceService; -import com.glxp.sale.admin.service.basic.UdiRelevanceService; -import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.inout.OrderService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; -import com.glxp.sale.admin.service.thrsys.*; import com.glxp.sale.admin.thread.BasicBackUpdateProductService; import com.glxp.sale.admin.util.BeanUtils; import com.glxp.sale.common.res.BaseResponse; @@ -36,13 +36,13 @@ import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.TransactionIsolationLevel; -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.ArrayList; +import java.util.Date; import java.util.List; @RestController @@ -66,6 +66,8 @@ public class SpsSyncUploadController { BussinessChangeTypeService bussinessChangeTypeService; @Resource EntrustReceService entrustReceService; + @Resource + private BasicDownloadService basicDownloadService; @PostMapping("sps/sync/basic/upload") public BaseResponse findProductInfo(@RequestBody SpsSyncDataResponse syncDataResponse) { @@ -109,6 +111,18 @@ public class SpsSyncUploadController { public void dlAllData(SpsSyncDataResponse syncDataResponse) { SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); + + BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); + basicDownloadStatusEntity.setId(syncDataResponse.getTaskId()); + basicDownloadStatusEntity.setStartTime(new Date()); + basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_BASIC_DATA); + basicDownloadStatusEntity.setStatus(0); + basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_DATA); + basicDownloadStatusEntity.setScheduleType(1); + + basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); + StringBuffer remark = new StringBuffer(); + //仓库字典导入 if (CollUtil.isNotEmpty(syncDataResponse.getInvWarehouseEntities())) { @@ -120,6 +134,7 @@ public class SpsSyncUploadController { } invWarehouseService.importInvWarehouse(syncDataResponse.getInvWarehouseEntities()); + remark.append("仓库字典：").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n"); } //仓库用户表 @@ -175,6 +190,7 @@ public class SpsSyncUploadController { mapper.importBasicUnitMaintain(basicUnitMaintainEntity); } batchSession.commit(); + remark.append("往来单位：").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n"); } catch (Exception e) { } } @@ -204,10 +220,27 @@ public class SpsSyncUploadController { mapper.insertThrInvWarehouse(thrInvWarehouseEntity); } batchSession.commit(); + remark.append("第三方仓库：").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n"); } catch (Exception e) { } } + //仓库用户表 + if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) { + for (WarehouseUserEntity warehouseUserEntity : syncDataResponse.getWarehouseUserEntities()) { + warehouseUserDao.insertOrUpdate(warehouseUserEntity); + } + remark.append("仓库用户：").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n"); + } + + //仓库单据类型表 + if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())) { + for (WarehouseBussinessTypeEntity warehouseUserEntity : syncDataResponse.getWarehouseBussinessTypeEntities()) { + warehouseBussinessTypeDao.insertOrUpdate(warehouseUserEntity); + } + remark.append("仓库单据：").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n"); + } + //第三方产品信息导入 if (CollUtil.isNotEmpty(syncDataResponse.getThrProductsEntities())) { @@ -220,6 +253,7 @@ public class SpsSyncUploadController { mapper.insertThrProducts(thrProductsEntity); } batchSession.commit(); + remark.append("第三方产品信息：").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n"); } catch (Exception e) { } } @@ -235,6 +269,7 @@ public class SpsSyncUploadController { mapper.importThrCorp(thrCorpEntity); }); batchSession.commit(); + remark.append("第三方往来单位：").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n"); } catch (Exception e) { } } @@ -249,6 +284,7 @@ public class SpsSyncUploadController { mapper.importThrOrder(thrOrderEntity); }); batchSession.commit(); + remark.append("第三方业务单据：").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n"); } catch (Exception e) { } } @@ -263,6 +299,7 @@ public class SpsSyncUploadController { mapper.importThrOrderDetail(thrOrderDetailEntity); }); batchSession.commit(); + remark.append("第三方业务单据详情：").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n"); } catch (Exception e) { } } @@ -274,17 +311,34 @@ public class SpsSyncUploadController { authAdmin.setLastModifyTime(null); authAdmin.setCustomerId(110); authAdminService.replaceAuthAdmin(authAdmin); + remark.append("用户信息：").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n"); } } // batchSession.clearCache(); batchSession.close(); + + basicDownloadStatusEntity.setStatus(1); + basicDownloadStatusEntity.setUpdateTime(new Date()); + basicDownloadStatusEntity.setEndTime(new Date()); + basicDownloadStatusEntity.setRemark(remark.toString()); + basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); } public void dlAllBus(SpsSyncBusResponse syncDataResponse) { SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); + BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); + basicDownloadStatusEntity.setId(syncDataResponse.getTaskId()); + basicDownloadStatusEntity.setStartTime(new Date()); + basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_BUS_TYPE); + basicDownloadStatusEntity.setStatus(0); + basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_BUS); + basicDownloadStatusEntity.setScheduleType(1); + + basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); + StringBuffer remark = new StringBuffer(); if (CollUtil.isNotEmpty(syncDataResponse.getBussinessTypeEntities())) { try { List bussinessTypeEntities = syncDataResponse.getBussinessTypeEntities(); @@ -294,6 +348,7 @@ public class SpsSyncUploadController { mapper.insertBussinessType(bussinessTypeEntity); } batchSession.commit(); + remark.append("扫码单据类型：").append(syncDataResponse.getBussinessTypeEntities().size()).append("条\n"); } catch (Exception e) { } } @@ -318,6 +373,7 @@ public class SpsSyncUploadController { } } batchSession.commit(); + remark.append("业务单据类型：").append(syncDataResponse.getBussinessTypeEntities().size()).append("条\n"); } catch (Exception e) { } } @@ -331,6 +387,7 @@ public class SpsSyncUploadController { mapper.insertBusOriginType(bussinessTypeEntity); } batchSession.commit(); + remark.append("第三方单据类型：").append(syncDataResponse.getBussinessTypeEntities().size()).append("条\n"); } catch (Exception e) { } } @@ -344,12 +401,28 @@ public class SpsSyncUploadController { } } batchSession.close(); + + basicDownloadStatusEntity.setStatus(1); + basicDownloadStatusEntity.setUpdateTime(new Date()); + basicDownloadStatusEntity.setEndTime(new Date()); + basicDownloadStatusEntity.setRemark(remark.toString()); + basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); } public void dlAllOrder(SpsSyncOrderResponse syncDataResponse) { SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); + BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); + basicDownloadStatusEntity.setId(syncDataResponse.getTaskId()); + basicDownloadStatusEntity.setStartTime(new Date()); + basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_SCAN_ORDER); + basicDownloadStatusEntity.setStatus(0); + basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_ORDER); + basicDownloadStatusEntity.setScheduleType(1); + + basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); + StringBuffer remark = new StringBuffer(); if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) { try { List orderEntities = syncDataResponse.getOrderEntities(); @@ -382,6 +455,7 @@ public class SpsSyncUploadController { } batchSession.commit(); + remark.append("单据：").append(syncDataResponse.getOrderEntities().size()).append("条\n"); } catch (Exception e) { } } @@ -409,5 +483,11 @@ public class SpsSyncUploadController { // } batchSession.close(); + + basicDownloadStatusEntity.setStatus(1); + basicDownloadStatusEntity.setUpdateTime(new Date()); + basicDownloadStatusEntity.setEndTime(new Date()); + basicDownloadStatusEntity.setRemark(remark.toString()); + basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicDownloadDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicDownloadDao.java new file mode 100644 index 0000000..7966e7a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicDownloadDao.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.dao.basic; + +import com.glxp.sale.admin.entity.basic.BasicDownloadStatusEntity; +import com.glxp.sale.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/sale/admin/entity/basic/BasicDownloadStatusEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicDownloadStatusEntity.java new file mode 100644 index 0000000..32f69bd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicDownloadStatusEntity.java @@ -0,0 +1,19 @@ +package com.glxp.sale.admin.entity.basic; + +import lombok.Data; + +import java.util.Date; + +@Data +public class BasicDownloadStatusEntity { + + private String id; + private String idDatas; + private Integer status; + private Integer type; + private Date updateTime; + private Integer scheduleType; + private Date startTime; + private Date endTime; + private String remark; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicDownloadRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicDownloadRequest.java new file mode 100644 index 0000000..c47cbab --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicDownloadRequest.java @@ -0,0 +1,15 @@ +package com.glxp.sale.admin.req.basic; + +import com.glxp.sale.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/sale/admin/res/basic/SpSyncUdiResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpSyncUdiResponse.java index 644b04c..eb054ed 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpSyncUdiResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/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/sale/admin/res/basic/SpsSyncBusResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncBusResponse.java index 44a3100..226b719 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncBusResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncBusResponse.java @@ -1,6 +1,5 @@ package com.glxp.sale.admin.res.basic; -import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.*; import lombok.Data; @@ -9,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/sale/admin/res/basic/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java index ec6a0a8..53df1d9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/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/sale/admin/res/basic/SpsSyncOrderResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncOrderResponse.java index 3571486..857cf92 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncOrderResponse.java @@ -2,7 +2,6 @@ package com.glxp.sale.admin.res.basic; import com.glxp.sale.admin.entity.inout.ErpOrderEntity; import com.glxp.sale.admin.entity.inout.OrderEntity; -import com.glxp.sale.admin.entity.inout.StockOrderEntity; import com.glxp.sale.admin.entity.inout.WarehouseEntity; import lombok.Data; @@ -11,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/sale/admin/service/basic/BasicDownloadService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicDownloadService.java new file mode 100644 index 0000000..b9c9d67 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicDownloadService.java @@ -0,0 +1,20 @@ +package com.glxp.sale.admin.service.basic; + + +import com.glxp.sale.admin.entity.basic.BasicDownloadStatusEntity; +import com.glxp.sale.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/sale/admin/service/basic/impl/BasicDownloadServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicDownloadServiceImpl.java new file mode 100644 index 0000000..437afc3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicDownloadServiceImpl.java @@ -0,0 +1,59 @@ +package com.glxp.sale.admin.service.basic.impl; + +import cn.hutool.core.collection.CollUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.basic.BasicDownloadDao; +import com.glxp.sale.admin.entity.basic.BasicDownloadStatusEntity; +import com.glxp.sale.admin.req.basic.BasicDownloadRequest; +import com.glxp.sale.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/resources/mybatis/mapper/basic/BasicDownloadDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml new file mode 100644 index 0000000..95f40d0 --- /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