diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 5b01d81df..149a95b92 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -19,7 +19,7 @@ import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.inv.InvPreinDetailEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; -import com.glxp.api.http.SpsDirectClient; +import com.glxp.api.http.sync.SpsDirectClient; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.inout.AddEnterCodeRequest; import com.glxp.api.req.inout.AddOrderRequest; @@ -30,7 +30,6 @@ import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRlSupResponse; import com.glxp.api.res.inout.AddCodeResult; import com.glxp.api.res.inout.IoCodeTempResponse; -import com.glxp.api.service.auth.DeptService; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.*; diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java new file mode 100644 index 000000000..3ad4649ec --- /dev/null +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -0,0 +1,85 @@ +package com.glxp.api.controller.sync; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.sync.BasicDownloadStatusEntity; +import com.glxp.api.http.sync.SpGetHttpClient; +import com.glxp.api.req.sync.BasicDownloadRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.sync.BasicDownloadService; +import com.glxp.api.util.RedisUtil; +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(); + + } + + + +} diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java new file mode 100644 index 000000000..4b0bdfdb1 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java @@ -0,0 +1,111 @@ +package com.glxp.api.controller.sync; + +import cn.hutool.core.collection.CollUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.sync.BasicExportStatusEntity; +import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; +import com.glxp.api.http.sync.SpGetHttpClient; +import com.glxp.api.req.sync.BasicExportStatusRequest; +import com.glxp.api.req.sync.BasicExportTimeRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.sync.BasicExportService; +import com.glxp.api.service.sync.BasicExportTimeService; +import com.glxp.api.util.RedisUtil; +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 SpsSyncExportStatusController { + + + @Resource + BasicExportService basicExportService; + @Resource + BasicExportTimeService basicExportTimeService; + @Resource + RedisUtil redisUtil; + @Resource + SpGetHttpClient spGetHttp; + + @GetMapping("/spssync/basic/udiinfo/getStatus") + public BaseResponse getStatus(BasicExportStatusRequest basicExportStatusRequest) { + List basicExportStatusEntities = basicExportService.filterExportStatus(basicExportStatusRequest); + return ResultVOUtils.success(basicExportStatusEntities); + } + + @GetMapping("/spssync/basic/udiinfo/filter") + public BaseResponse filterStatus(BasicExportStatusRequest basicExportStatusRequest) { + + log.info(Thread.currentThread().getName() + "--" + Thread.currentThread().getId()); + List basicExportStatusEntities = basicExportService.filterExportStatus(basicExportStatusRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicExportStatusEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicExportStatusEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/spssync/basic/udiinfo/deleteByStatus") + public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) { + + boolean b = basicExportService.deleteById(deleteRequest.getId()); + redisUtil.del(deleteRequest.getId()); + if (b) + return ResultVOUtils.success("删除成功！"); + else + return ResultVOUtils.error(500, "删除失败！"); + } + + @PostMapping("/spssync/basic/udiinfo/updateStatus") + public BaseResponse updateStatus(@RequestBody BasicExportStatusEntity basicExportStatusEntity) { + + basicExportStatusEntity.setEndTime(new Date()); + basicExportStatusEntity.setUpdateTime(new Date()); + boolean b = basicExportService.updateExportStatus(basicExportStatusEntity); + if (b) + return ResultVOUtils.success("更新成功！"); + else + return ResultVOUtils.error(500, "更新成功！"); + } + + @GetMapping("/spssync/basic/connect/test") + public BaseResponse testConnect() { + return spGetHttp.testConnect(); + + } + + @GetMapping("/spssync/basic/schedule/lastTime") + public BaseResponse getLastUpdateTime(BasicExportTimeRequest basicExportTimeRequest) { + List basicExportStatusEntities = basicExportTimeService.filterExportStatus(basicExportTimeRequest); + if (CollUtil.isNotEmpty(basicExportStatusEntities)) { + return ResultVOUtils.success(basicExportStatusEntities.get(0).getLastUpdateTime()); + } else { + return ResultVOUtils.success("1949-01-01 00:00:00"); + } + } + + @PostMapping("/spssync/basic/schedule/updateLastTime") + public BaseResponse updateLastTime(@RequestBody BasicExportStatusTimeEntity basicExportStatusTimeEntity) { + + boolean b = basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); + if (b) + return ResultVOUtils.success("更新成功！"); + else + return ResultVOUtils.error(500, "更新失败！"); + } + + +} diff --git a/src/main/java/com/glxp/api/controller/system/SyncDataSetController.java b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java similarity index 98% rename from src/main/java/com/glxp/api/controller/system/SyncDataSetController.java rename to src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java index b43445b52..ecea86942 100644 --- a/src/main/java/com/glxp/api/controller/system/SyncDataSetController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java @@ -1,4 +1,4 @@ -package com.glxp.api.controller.system; +package com.glxp.api.controller.sync; import cn.hutool.core.collection.CollUtil; import com.glxp.api.annotation.AuthRuleAnnotation; diff --git a/src/main/java/com/glxp/api/dao/sync/BasicDownloadDao.java b/src/main/java/com/glxp/api/dao/sync/BasicDownloadDao.java new file mode 100644 index 000000000..ed241bfde --- /dev/null +++ b/src/main/java/com/glxp/api/dao/sync/BasicDownloadDao.java @@ -0,0 +1,24 @@ +package com.glxp.api.dao.sync; + +import com.glxp.api.entity.sync.BasicDownloadStatusEntity; +import com.glxp.api.req.sync.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); + + + boolean deleteByTime(); +} diff --git a/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java b/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java new file mode 100644 index 000000000..e85a32561 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java @@ -0,0 +1,24 @@ +package com.glxp.api.dao.sync; + +import com.glxp.api.entity.sync.BasicExportStatusEntity; +import com.glxp.api.req.sync.BasicExportStatusRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BasicExportDao { + + + List filterExportStatus(BasicExportStatusRequest basicExportStatusRequest); + + boolean insertExportStatus(BasicExportStatusEntity ioOrderStatusEntity); + + boolean deleteById(@Param("id") String id); + + boolean updateExportStatus(BasicExportStatusEntity warehouseEntity); + + + boolean deleteByTime(); +} diff --git a/src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java b/src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java new file mode 100644 index 000000000..aa615cca7 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java @@ -0,0 +1,20 @@ +package com.glxp.api.dao.sync; + +import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; +import com.glxp.api.req.sync.BasicExportTimeRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface BasicExportTimeDao { + + + List filterExportStatus(BasicExportTimeRequest basicExportStatusRequest); + + boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity); + + boolean deleteById(String id); + + boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity); +} diff --git a/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java new file mode 100644 index 000000000..9842cd3ed --- /dev/null +++ b/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java @@ -0,0 +1,27 @@ +package com.glxp.api.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class BasicDownloadStatusEntity { + + /** + * 记录ID + */ + private String id; + + /** + * 任务ID + */ + private String taskId; + 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/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java new file mode 100644 index 000000000..66d87cf5a --- /dev/null +++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java @@ -0,0 +1,25 @@ +package com.glxp.api.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class BasicExportStatusEntity { + + 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; + + /** + * 接收状态 -1：接收失败 0：等待接收 1：接收成功 + */ + private Integer receiveStatus; + +} diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java new file mode 100644 index 000000000..fc5164266 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java @@ -0,0 +1,13 @@ +package com.glxp.api.entity.sync; + +import lombok.Data; + +@Data +public class BasicExportStatusTimeEntity { + + private Integer id; + private String lastUpdateTime; + private String key; + private String remark; + +} diff --git a/src/main/java/com/glxp/api/entity/sync/IOOrderStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/IOOrderStatusEntity.java new file mode 100644 index 000000000..3ac10fc5d --- /dev/null +++ b/src/main/java/com/glxp/api/entity/sync/IOOrderStatusEntity.java @@ -0,0 +1,13 @@ +package com.glxp.api.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class IOOrderStatusEntity { + private Integer id; + private String orderId; + private Integer status; + private Date updateTime; +} diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java new file mode 100644 index 000000000..8ba473898 --- /dev/null +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -0,0 +1,162 @@ +package com.glxp.api.http.sync; + +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.sync.BasicExportStatusEntity; +import com.glxp.api.entity.sync.IOOrderStatusEntity; +import com.glxp.api.entity.system.SyncDataSetEntity; +import com.glxp.api.req.sync.BasicExportStatusRequest; +import com.glxp.api.req.sync.OrderStatusFilterRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.sync.DlOrderResponse; +import com.glxp.api.service.system.SyncDataSetService; +import com.glxp.api.util.OkHttpCli; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class SpGetHttpClient { + + @Resource + private OkHttpCli okHttpCli; + + @Resource + SyncDataSetService syncDataSetService; + + public String getIpUrl() { + SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet(); + return syncDataSetEntity.getSyncIp(); + } + + + public BaseResponse> getOrderStatus() { + Map paramMap = new HashMap<>(16); + paramMap.put("status", 1 + ""); + String response = okHttpCli.doGet(getIpUrl() + "/spms/inout/order/status", paramMap); + try { + BaseResponse> data = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return data; + + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "下载失败！"); + } + } + + + public BaseResponse> getOrders(String orderId) { + Map paramMap = new HashMap<>(16); + paramMap.put("orderId", orderId); + String response = okHttpCli.doGet(getIpUrl() + "/spms/inout/order/dlByStatus", paramMap); + try { + BaseResponse> data = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return data; + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "下载失败！"); + } + } + + + public BaseResponse postOrder(String orderId) { + OrderStatusFilterRequest orderStatusFilterRequest = new OrderStatusFilterRequest(); + orderStatusFilterRequest.setOrderId(orderId); + orderStatusFilterRequest.setStatus(2); + String json = JSONUtil.toJsonStr(orderStatusFilterRequest); + String result = okHttpCli.doPostJson(getIpUrl() + "/spms/inout/order/updateStatus", json); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + + + public BaseResponse> getBasicStatus(String type) { + Map paramMap = new HashMap<>(16); + paramMap.put("type", type); + paramMap.put("status", "3"); + String response = okHttpCli.doGet(getIpUrl() + "/spssync/basic/udiinfo/getStatus", paramMap); + try { + BaseResponse> data = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return data; + + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "下载失败！"); + } + } + + public BaseResponse testConnect() { + String response = okHttpCli.doGet(getIpUrl() + "/sps/sync/connect/test"); + try { + BaseResponse data = + JSONObject.parseObject(response, new TypeReference>() { + }); + return data; + + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "网络错误！"); + } + } + + public BaseResponse> getBasicStatus(BasicExportStatusRequest basicExportStatusRequest) { + Map paramMap = new HashMap<>(16); + if (basicExportStatusRequest.getType() != null) + paramMap.put("type", basicExportStatusRequest.getType() + ""); + if (basicExportStatusRequest.getStatus() != null) + paramMap.put("status", basicExportStatusRequest.getStatus() + ""); + if (basicExportStatusRequest.getId() != null) + paramMap.put("id", basicExportStatusRequest.getId()); + if (basicExportStatusRequest.getScheduleType() != null) + paramMap.put("scheduleType", basicExportStatusRequest.getScheduleType() + ""); + String response = okHttpCli.doGet(getIpUrl() + "/spssync/basic/udiinfo/getStatus", paramMap); + try { + BaseResponse> data = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return data; + + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "下载失败！"); + } + } + + + public String getBasicData(String id, int type) { + BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest(); + basicExportStatusRequest.setId(id); + basicExportStatusRequest.setType(type); + String json = JSONUtil.toJsonStr(basicExportStatusRequest); + String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/basic/udiinfo/downloadByStatus", json); + return result; + } + + + public BaseResponse postBasicStatus(String id) { + BasicExportStatusRequest basicStatusFilterRequest = new BasicExportStatusRequest(); + basicStatusFilterRequest.setId(id); + String json = JSONUtil.toJsonStr(basicStatusFilterRequest); + String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/basic/udiinfo/deleteByStatus", json); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + + +} diff --git a/src/main/java/com/glxp/api/http/SpsDirectClient.java b/src/main/java/com/glxp/api/http/sync/SpsDirectClient.java similarity index 98% rename from src/main/java/com/glxp/api/http/SpsDirectClient.java rename to src/main/java/com/glxp/api/http/sync/SpsDirectClient.java index 20c200444..f05c9db5d 100644 --- a/src/main/java/com/glxp/api/http/SpsDirectClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpsDirectClient.java @@ -1,4 +1,4 @@ -package com.glxp.api.http; +package com.glxp.api.http.sync; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; @@ -27,7 +27,7 @@ public class SpsDirectClient { return syncDataSetEntity.getSyncIp(); } - //单据验收 todo +// //单据验收 // public BaseResponse reviewOrder(OrderFilterRequest orderFilterRequest) { // String json = JSONUtil.toJsonStr(orderFilterRequest); // String result = okHttpCli.doPostJson(getIpUrl() + "/sps/review/download/order/finsih", json); diff --git a/src/main/java/com/glxp/api/req/sync/BasicDownloadRequest.java b/src/main/java/com/glxp/api/req/sync/BasicDownloadRequest.java new file mode 100644 index 000000000..ba4b52b65 --- /dev/null +++ b/src/main/java/com/glxp/api/req/sync/BasicDownloadRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.req.sync; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class BasicDownloadRequest extends ListPageRequest { + private String id; + private String taskId; //任务ID + private Integer status; + private Integer type; + private String idDatas; + private Integer scheduleType; + public Integer createType; + private String syncTime; +} diff --git a/src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java b/src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java new file mode 100644 index 000000000..796cb7e0b --- /dev/null +++ b/src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java @@ -0,0 +1,15 @@ +package com.glxp.api.req.sync; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class BasicExportStatusRequest 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/src/main/java/com/glxp/api/req/sync/BasicExportTimeRequest.java b/src/main/java/com/glxp/api/req/sync/BasicExportTimeRequest.java new file mode 100644 index 000000000..71ab0b665 --- /dev/null +++ b/src/main/java/com/glxp/api/req/sync/BasicExportTimeRequest.java @@ -0,0 +1,10 @@ +package com.glxp.api.req.sync; + +import lombok.Data; + +@Data +public class BasicExportTimeRequest { + + private Integer id; + private String key; +} diff --git a/src/main/java/com/glxp/api/req/sync/OrderStatusFilterRequest.java b/src/main/java/com/glxp/api/req/sync/OrderStatusFilterRequest.java new file mode 100644 index 000000000..0e37721e2 --- /dev/null +++ b/src/main/java/com/glxp/api/req/sync/OrderStatusFilterRequest.java @@ -0,0 +1,10 @@ +package com.glxp.api.req.sync; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class OrderStatusFilterRequest extends ListPageRequest { + private String orderId; + private Integer status; +} diff --git a/src/main/java/com/glxp/api/res/sync/DlOrderResponse.java b/src/main/java/com/glxp/api/res/sync/DlOrderResponse.java new file mode 100644 index 000000000..475c5611c --- /dev/null +++ b/src/main/java/com/glxp/api/res/sync/DlOrderResponse.java @@ -0,0 +1,10 @@ +package com.glxp.api.res.sync; + +import lombok.Data; + +import java.util.List; + +@Data +public class DlOrderResponse { + +} diff --git a/src/main/java/com/glxp/api/service/sync/BasicDownloadService.java b/src/main/java/com/glxp/api/service/sync/BasicDownloadService.java new file mode 100644 index 000000000..c47516bb1 --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/BasicDownloadService.java @@ -0,0 +1,22 @@ +package com.glxp.api.service.sync; + + +import com.glxp.api.entity.sync.BasicDownloadStatusEntity; +import com.glxp.api.req.sync.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); + + boolean deleteByTime(); +} diff --git a/src/main/java/com/glxp/api/service/sync/BasicExportService.java b/src/main/java/com/glxp/api/service/sync/BasicExportService.java new file mode 100644 index 000000000..65487cea0 --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/BasicExportService.java @@ -0,0 +1,23 @@ +package com.glxp.api.service.sync; + + +import com.glxp.api.entity.sync.BasicExportStatusEntity; +import com.glxp.api.req.sync.BasicExportStatusRequest; + +import java.util.List; + +public interface BasicExportService { + + BasicExportStatusEntity findByData(String idDatas, Integer status); + + List filterExportStatus(BasicExportStatusRequest basicExportStatusRequest); + + boolean insertExportStatus(BasicExportStatusEntity ioOrderStatusEntity); + + boolean deleteById(String id); + + boolean updateExportStatus(BasicExportStatusEntity warehouseEntity); + + boolean deleteByTime(); + +} diff --git a/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java b/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java new file mode 100644 index 000000000..3147fc9ef --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java @@ -0,0 +1,22 @@ +package com.glxp.api.service.sync; + + + +import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; +import com.glxp.api.req.sync.BasicExportTimeRequest; + +import java.util.List; + +public interface BasicExportTimeService { + + BasicExportStatusTimeEntity findByKey(String key); + + List filterExportStatus(BasicExportTimeRequest basicExportStatusRequest); + + boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity); + + boolean deleteById(String id); + + boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity); + +} diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java new file mode 100644 index 000000000..b3bfeb73b --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java @@ -0,0 +1,66 @@ +package com.glxp.api.service.sync.impl; + +import cn.hutool.core.collection.CollUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.sync.BasicDownloadDao; +import com.glxp.api.entity.sync.BasicDownloadStatusEntity; +import com.glxp.api.req.sync.BasicDownloadRequest; +import com.glxp.api.service.sync.BasicDownloadService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +@Transactional(rollbackFor = Exception.class) +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); + } + + @Override + public boolean deleteByTime() { + return basicDownloadDao.deleteByTime(); + } +} diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java new file mode 100644 index 000000000..5cfd22f23 --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java @@ -0,0 +1,66 @@ +package com.glxp.api.service.sync.impl; + +import cn.hutool.core.collection.CollUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.sync.BasicExportDao; +import com.glxp.api.entity.sync.BasicExportStatusEntity; +import com.glxp.api.req.sync.BasicExportStatusRequest; +import com.glxp.api.service.sync.BasicExportService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +@Transactional(rollbackFor = Exception.class) +public class BasicExportServiceImpl implements BasicExportService { + + @Resource + BasicExportDao basicExportDao; + + @Override + public BasicExportStatusEntity findByData(String idDatas, Integer status) { + BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest(); + basicExportStatusRequest.setStatus(status); + basicExportStatusRequest.setIdDatas(idDatas); + List basicExportStatusEntities = basicExportDao.filterExportStatus(basicExportStatusRequest); + if (CollUtil.isNotEmpty(basicExportStatusEntities)) { + return basicExportStatusEntities.get(0); + } + return null; + } + + @Override + public List filterExportStatus(BasicExportStatusRequest basicExportStatusRequest) { + if (basicExportStatusRequest == null) { + return Collections.emptyList(); + } + if (basicExportStatusRequest.getPage() != null) { + int offset = (basicExportStatusRequest.getPage() - 1) * basicExportStatusRequest.getLimit(); + PageHelper.offsetPage(offset, basicExportStatusRequest.getLimit()); + } + return basicExportDao.filterExportStatus(basicExportStatusRequest); + } + + @Override + public boolean insertExportStatus(BasicExportStatusEntity basicExportStatusEntity) { + return basicExportDao.insertExportStatus(basicExportStatusEntity); + } + + @Override + public boolean deleteById(String id) { + return basicExportDao.deleteById(id); + } + + @Override + public boolean updateExportStatus(BasicExportStatusEntity basicExportStatusEntity) { + return basicExportDao.updateExportStatus(basicExportStatusEntity); + } + + @Override + public boolean deleteByTime() { + return basicExportDao.deleteByTime(); + } +} diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java new file mode 100644 index 000000000..836dbcb37 --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java @@ -0,0 +1,56 @@ +package com.glxp.api.service.sync.impl; + +import cn.hutool.core.collection.CollUtil; +import com.glxp.api.dao.sync.BasicExportTimeDao; +import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; +import com.glxp.api.req.sync.BasicExportTimeRequest; +import com.glxp.api.service.sync.BasicExportTimeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class BasicExportTimeServiceImpl implements BasicExportTimeService { + + @Resource + BasicExportTimeDao basicExportTimeDao; + + + @Override + public BasicExportStatusTimeEntity findByKey(String key) { + BasicExportTimeRequest basicExportTimeRequest = new BasicExportTimeRequest(); + basicExportTimeRequest.setKey(key); + List basicExportStatusTimeEntities = filterExportStatus(basicExportTimeRequest); + if (CollUtil.isNotEmpty(basicExportStatusTimeEntities)) { + return basicExportStatusTimeEntities.get(0); + } + return null; + } + + @Override + public List filterExportStatus(BasicExportTimeRequest basicExportStatusRequest) { + if (basicExportStatusRequest == null) { + return Collections.emptyList(); + } + return basicExportTimeDao.filterExportStatus(basicExportStatusRequest); + } + + @Override + public boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity) { + return basicExportTimeDao.insertExportStatus(basicExportStatusTimeEntity); + + } + + @Override + public boolean deleteById(String id) { + return basicExportTimeDao.deleteById(id); + } + + @Override + public boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity) { + return basicExportTimeDao.updateExportStatus(basicExportStatusTimeEntity); + + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1c0966353..a3fb0cb76 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev + active: pro jmx: enabled: false diff --git a/src/main/resources/mybatis/mapper/sync/BasicDownloadDao.xml b/src/main/resources/mybatis/mapper/sync/BasicDownloadDao.xml new file mode 100644 index 000000000..b52ced8d6 --- /dev/null +++ b/src/main/resources/mybatis/mapper/sync/BasicDownloadDao.xml @@ -0,0 +1,91 @@ + + + + + + + + + replace + INTO basic_download_status(id, taskId, idDatas, status, type, updateTime, scheduleType, startTime, + endTime, remark) + values (#{id}, + #{taskId}, + #{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} + + + + Delete + From basic_download_status + where date(startTime) <= date(DATE_SUB(NOW(), INTERVAL 30 day)) + + diff --git a/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml b/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml new file mode 100644 index 000000000..582d6cf7b --- /dev/null +++ b/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml @@ -0,0 +1,74 @@ + + + + + + + + + + replace + INTO basic_export_status(id,idDatas,status,type,updateTime,scheduleType,startTime,endTime,remark) + values( + #{id}, + #{idDatas}, + #{status}, + #{type}, + #{updateTime}, + #{scheduleType}, + #{startTime}, + #{endTime}, + #{remark} + ) + + + + UPDATE basic_export_status + + idDatas=#{idDatas}, + status=#{status}, + type=#{type}, + updateTime=#{updateTime}, + scheduleType=#{scheduleType}, + startTime=#{startTime}, + endTime=#{endTime}, + remark=#{remark}, + + WHERE id = #{id} + + + DELETE + FROM basic_export_status + WHERE id = #{id} + + + + Delete From basic_export_status + where date(startTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + diff --git a/src/main/resources/mybatis/mapper/sync/BasicExportTimeDao.xml b/src/main/resources/mybatis/mapper/sync/BasicExportTimeDao.xml new file mode 100644 index 000000000..794dde2b0 --- /dev/null +++ b/src/main/resources/mybatis/mapper/sync/BasicExportTimeDao.xml @@ -0,0 +1,46 @@ + + + + + + + + + replace + INTO basic_export_status_time(`key`, lastUpdateTime, remark) + values (#{key}, + #{lastUpdateTime}, + #{remark}) + + + + UPDATE basic_export_status_time + + + lastUpdateTime=#{lastUpdateTime}, + + + remark=#{remark}, + + + WHERE `key` = #{key} + + + DELETE + FROM basic_export_status_time + WHERE id = #{id} + +