新增同步设置相关功能界面

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.*;

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<BasicDownloadStatusEntity> basicDownloadStatusEntities = basicDownloadService.filterDownloadStatus(basicDownloadRequest);
+        return ResultVOUtils.success(basicDownloadStatusEntities);
+    }
+
+    @GetMapping("/spssync/download/basic/udiinfo/filter")
+    public BaseResponse filterStatus(BasicDownloadRequest basicDownloadRequest) {
+        List<BasicDownloadStatusEntity> basicDownloadStatusEntities = basicDownloadService.filterDownloadStatus(basicDownloadRequest);
+        PageInfo<BasicDownloadStatusEntity> pageInfo;
+        pageInfo = new PageInfo<>(basicDownloadStatusEntities);
+        PageSimpleResponse<BasicDownloadStatusEntity> 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();
+
+    }
+
+
+
+}

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<BasicExportStatusEntity> 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<BasicExportStatusEntity> basicExportStatusEntities = basicExportService.filterExportStatus(basicExportStatusRequest);
+        PageInfo<BasicExportStatusEntity> pageInfo;
+        pageInfo = new PageInfo<>(basicExportStatusEntities);
+        PageSimpleResponse<BasicExportStatusEntity> 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<BasicExportStatusTimeEntity> 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, "更新失败！");
+    }
+
+
+}

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;

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<BasicDownloadStatusEntity> filterDownloadStatus(BasicDownloadRequest basicDownloadRequest);
+
+    boolean insertDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity);
+
+    boolean deleteById(@Param("id") String id);
+
+    boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity);
+
+
+    boolean deleteByTime();
+}

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<BasicExportStatusEntity> filterExportStatus(BasicExportStatusRequest basicExportStatusRequest);
+
+    boolean insertExportStatus(BasicExportStatusEntity ioOrderStatusEntity);
+
+    boolean deleteById(@Param("id") String id);
+
+    boolean updateExportStatus(BasicExportStatusEntity warehouseEntity);
+
+
+    boolean deleteByTime();
+}

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<BasicExportStatusTimeEntity> filterExportStatus(BasicExportTimeRequest basicExportStatusRequest);
+
+    boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity);
+
+    boolean deleteById(String id);
+
+    boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity);
+}

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;
+}

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;
+
+}

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;
+
+}

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;
+}

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<PageSimpleResponse<IOOrderStatusEntity>> getOrderStatus() {
+        Map<String, String> paramMap = new HashMap<>(16);
+        paramMap.put("status", 1 + "");
+        String response = okHttpCli.doGet(getIpUrl() + "/spms/inout/order/status", paramMap);
+        try {
+            BaseResponse<PageSimpleResponse<IOOrderStatusEntity>> data =
+                    JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<IOOrderStatusEntity>>>() {
+                    });
+            return data;
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultVOUtils.error(500, "下载失败！");
+        }
+    }
+
+
+    public BaseResponse<List<DlOrderResponse>> getOrders(String orderId) {
+        Map<String, String> paramMap = new HashMap<>(16);
+        paramMap.put("orderId", orderId);
+        String response = okHttpCli.doGet(getIpUrl() + "/spms/inout/order/dlByStatus", paramMap);
+        try {
+            BaseResponse<List<DlOrderResponse>> data =
+                    JSONObject.parseObject(response, new TypeReference<BaseResponse<List<DlOrderResponse>>>() {
+                    });
+            return data;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultVOUtils.error(500, "下载失败！");
+        }
+    }
+
+
+    public BaseResponse<String> 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<String> response =
+                JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
+                });
+        return response;
+    }
+
+
+    public BaseResponse<List<BasicExportStatusEntity>> getBasicStatus(String type) {
+        Map<String, String> paramMap = new HashMap<>(16);
+        paramMap.put("type", type);
+        paramMap.put("status", "3");
+        String response = okHttpCli.doGet(getIpUrl() + "/spssync/basic/udiinfo/getStatus", paramMap);
+        try {
+            BaseResponse<List<BasicExportStatusEntity>> data =
+                    JSONObject.parseObject(response, new TypeReference<BaseResponse<List<BasicExportStatusEntity>>>() {
+                    });
+            return data;
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultVOUtils.error(500, "下载失败！");
+        }
+    }
+
+    public BaseResponse<String> testConnect() {
+        String response = okHttpCli.doGet(getIpUrl() + "/sps/sync/connect/test");
+        try {
+            BaseResponse<String> data =
+                    JSONObject.parseObject(response, new TypeReference<BaseResponse<String>>() {
+                    });
+            return data;
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultVOUtils.error(500, "网络错误！");
+        }
+    }
+
+    public BaseResponse<List<BasicExportStatusEntity>> getBasicStatus(BasicExportStatusRequest basicExportStatusRequest) {
+        Map<String, String> 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<List<BasicExportStatusEntity>> data =
+                    JSONObject.parseObject(response, new TypeReference<BaseResponse<List<BasicExportStatusEntity>>>() {
+                    });
+            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<String> 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<String> response =
+                JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
+                });
+        return response;
+    }
+
+
+}

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);

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;
+}

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;
+}

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;
+}

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;
+}

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 {
+
+}

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<BasicDownloadStatusEntity> filterDownloadStatus(BasicDownloadRequest basicDownloadRequest);
+
+    boolean insertDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity);
+
+    boolean deleteById(String id);
+
+    boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity);
+
+    boolean deleteByTime();
+}

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<BasicExportStatusEntity> filterExportStatus(BasicExportStatusRequest basicExportStatusRequest);
+
+    boolean insertExportStatus(BasicExportStatusEntity ioOrderStatusEntity);
+
+    boolean deleteById(String id);
+
+    boolean updateExportStatus(BasicExportStatusEntity warehouseEntity);
+
+    boolean deleteByTime();
+
+}

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<BasicExportStatusTimeEntity> filterExportStatus(BasicExportTimeRequest basicExportStatusRequest);
+
+    boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity);
+
+    boolean deleteById(String id);
+
+    boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity);
+
+}

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<BasicDownloadStatusEntity> basicDownloadStatusEntities = basicDownloadDao.filterDownloadStatus(basicDownloadRequest);
+        if (CollUtil.isNotEmpty(basicDownloadStatusEntities)) {
+            return basicDownloadStatusEntities.get(0);
+        }
+        return null;
+    }
+
+    @Override
+    public List<BasicDownloadStatusEntity> 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();
+    }
+}

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<BasicExportStatusEntity> basicExportStatusEntities = basicExportDao.filterExportStatus(basicExportStatusRequest);
+        if (CollUtil.isNotEmpty(basicExportStatusEntities)) {
+            return basicExportStatusEntities.get(0);
+        }
+        return null;
+    }
+
+    @Override
+    public List<BasicExportStatusEntity> 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();
+    }
+}

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<BasicExportStatusTimeEntity> basicExportStatusTimeEntities = filterExportStatus(basicExportTimeRequest);
+        if (CollUtil.isNotEmpty(basicExportStatusTimeEntities)) {
+            return basicExportStatusTimeEntities.get(0);
+        }
+        return null;
+    }
+
+    @Override
+    public List<BasicExportStatusTimeEntity> 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);
+
+    }
+}

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: pro
   jmx:
     enabled: false
 

src/main/resources/mybatis/mapper/sync/BasicDownloadDao.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.api.dao.sync.BasicDownloadDao">
+    <select id="filterDownloadStatus" parameterType="com.glxp.api.req.sync.BasicDownloadRequest"
+            resultType="com.glxp.api.entity.sync.BasicDownloadStatusEntity">
+        select *
+        from basic_download_status
+        <where>
+            <if test="id != '' and id != null">
+                and id = #{id}
+            </if>
+            <if test="taskId != null and taskId != ''">
+                AND taskId LIKE concat('%', #{taskId}, '%')
+            </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
+            <if test="type != null">
+                and `type` = #{type}
+            </if>
+            <if test="idDatas != '' and idDatas != null">
+                and idDatas = #{idDatas}
+            </if>
+            <if test="scheduleType != null">
+                and scheduleType = #{scheduleType}
+            </if>
+        </where>
+        order by updateTime desc
+    </select>
+
+
+    <insert id="insertDownloadStatus" keyProperty="id"
+            parameterType="com.glxp.api.entity.sync.BasicDownloadStatusEntity">
+        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})
+    </insert>
+
+    <update id="updateDownloadStatus" parameterType="com.glxp.api.entity.sync.BasicDownloadStatusEntity">
+        UPDATE basic_download_status
+        <trim prefix="set" suffixOverrides=",">
+            <if test="idDatas != null">
+                idDatas=#{idDatas},
+            </if>
+            <if test="status != null">
+                status=#{status},
+            </if>
+            <if test="type != null">
+                type=#{type},
+            </if>
+            <if test="updateTime != null">
+                updateTime=#{updateTime},
+            </if>
+            <if test="scheduleType != null">
+                scheduleType=#{scheduleType},
+            </if>
+            <if test="startTime != null">
+                startTime=#{startTime},
+            </if>
+            <if test="endTime != null">
+                endTime=#{endTime},
+            </if>
+            <if test="remark != null">
+                remark=#{remark},
+            </if>
+        </trim>
+        WHERE id = #{id}
+    </update>
+    <delete id="deleteById" parameterType="Map">
+        DELETE
+        FROM basic_download_status
+        WHERE id = #{id}
+    </delete>
+
+    <delete id="deleteByTime">
+        Delete
+        From basic_download_status
+        where date(startTime) &lt;= date(DATE_SUB(NOW(), INTERVAL 30 day))
+    </delete>
+</mapper>

src/main/resources/mybatis/mapper/sync/BasicExportDao.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.api.dao.sync.BasicExportDao">
+
+    <select id="filterExportStatus" parameterType="com.glxp.api.req.sync.BasicExportStatusRequest"
+            resultType="com.glxp.api.entity.sync.BasicExportStatusEntity">
+        select * from basic_export_status
+        <where>
+            <if test="id != null and id != ''">
+                AND id LIKE concat('%',#{id},'%')
+            </if>
+            <if test="status!=null">
+                and status = #{status}
+            </if>
+            <if test="type!=null">
+                and `type` = #{type}
+            </if>
+            <if test="idDatas != '' and idDatas!=null">
+                and idDatas = #{idDatas}
+            </if>
+            <if test="scheduleType!=null">
+                and scheduleType = #{scheduleType}
+            </if>
+            <if test="syncTime != null and syncTime != ''">
+                and #{syncTime} >= startTime and #{syncTime} &lt;= endTime
+            </if>
+        </where>
+        order by updateTime desc
+    </select>
+
+
+    <insert id="insertExportStatus" keyProperty="id"
+            parameterType="com.glxp.api.entity.sync.BasicExportStatusEntity">
+        replace
+        INTO basic_export_status(id,idDatas,status,type,updateTime,scheduleType,startTime,endTime,remark)
+        values(
+        #{id},
+        #{idDatas},
+        #{status},
+        #{type},
+        #{updateTime},
+        #{scheduleType},
+        #{startTime},
+        #{endTime},
+        #{remark}
+        )
+    </insert>
+
+    <update id="updateExportStatus" parameterType="com.glxp.api.entity.sync.BasicExportStatusEntity">
+        UPDATE basic_export_status
+        <trim prefix="set" suffixOverrides=",">
+            <if test="idDatas != null">idDatas=#{idDatas},</if>
+            <if test="status != null">status=#{status},</if>
+            <if test="type != null">type=#{type},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
+            <if test="scheduleType != null">scheduleType=#{scheduleType},</if>
+            <if test="startTime != null">startTime=#{startTime},</if>
+            <if test="endTime != null">endTime=#{endTime},</if>
+            <if test="remark != null">remark=#{remark},</if>
+        </trim>
+        WHERE id = #{id}
+    </update>
+    <delete id="deleteById" parameterType="Map">
+        DELETE
+        FROM basic_export_status
+        WHERE id = #{id}
+    </delete>
+
+    <delete id="deleteByTime">
+        Delete From basic_export_status
+        where date(startTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day))
+    </delete>
+</mapper>

src/main/resources/mybatis/mapper/sync/BasicExportTimeDao.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.api.dao.sync.BasicExportTimeDao">
+    <select id="filterExportStatus" parameterType="com.glxp.api.req.sync.BasicExportTimeRequest"
+            resultType="com.glxp.api.entity.sync.BasicExportStatusTimeEntity">
+        select *
+        from basic_export_status_time
+        <where>
+            <if test="id != '' and id != null">
+                and id = #{id}
+            </if>
+            <if test="key != '' and key != null">
+                and `key` = #{key}
+            </if>
+        </where>
+    </select>
+
+
+    <insert id="insertExportStatus" keyProperty="id"
+            parameterType="com.glxp.api.entity.sync.BasicExportStatusTimeEntity">
+        replace
+                INTO basic_export_status_time(`key`, lastUpdateTime, remark)
+        values (#{key},
+                #{lastUpdateTime},
+                #{remark})
+    </insert>
+
+    <update id="updateExportStatus" parameterType="com.glxp.api.entity.sync.BasicExportStatusTimeEntity">
+        UPDATE basic_export_status_time
+        <trim prefix="set" suffixOverrides=",">
+            <if test="lastUpdateTime != null">
+                lastUpdateTime=#{lastUpdateTime},
+            </if>
+            <if test="remark != null">
+                remark=#{remark},
+            </if>
+        </trim>
+        WHERE `key` = #{key}
+    </update>
+    <delete id="deleteById" parameterType="Map">
+        DELETE
+        FROM basic_export_status_time
+        WHERE id = #{id}
+    </delete>
+</mapper>