单据同步相关修改

src/main/java/com/glxp/api/constant/BasicProcessStatus.java

@@ -28,6 +28,7 @@ public class BasicProcessStatus {
     public static final int NEW_ALL_DATA = 7;       //所有最新数据
     public static final int NEW_ALL_BUS = 8;
     public static final String NEW_ALL_ORDER = "9";
+    public static final String ALL_BUS_ORDER = "11";
     public static final int NEW_ALL_DI = 10;
 
     public static final int SCHEDULE_NORMAL = 1;        //常规任务

src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java

@@ -16,6 +16,7 @@ import com.glxp.api.res.sync.SpsSyncBusOrderResponse;
 import com.glxp.api.res.sync.SpsSyncOrderResponse;
 import com.glxp.api.service.sync.SyncDataSetService;
 import com.glxp.api.util.OkHttpCli;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -32,15 +33,25 @@ public class SpGetHttpClient {
     @Resource
     SyncDataSetService syncDataSetService;
 
+    @Value("${API_KEY}")
+    private String apiKey;
+    @Value("${API_SECRET}")
+    private String apiSecret;
+
     public String getIpUrl() {
         SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet();
         return syncDataSetEntity.getSyncIp();
     }
 
+    public String[] buildHeader() {
+        String[] headers = {"apiKey", apiKey, "apiSecret", apiSecret};
+        return headers;
+    }
+
 
     public BaseResponse<String> postAllOrder(SpsSyncOrderResponse spsSyncOrderResponse) {
         String json = JSONUtil.toJsonStr(spsSyncOrderResponse);
-        String result = okHttpCli.doPostJson(getIpUrl() + "/orderApi/sps/sync/order/upload", json);
+        String result = okHttpCli.doPostJson(getIpUrl() + "/orderApi/sps/sync/order/upload", json, buildHeader());
         BaseResponse<String> response =
                 JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
                 });
@@ -49,7 +60,7 @@ public class SpGetHttpClient {
 
     public BaseResponse<String> postAllBusOrder(SpsSyncBusOrderResponse spsSyncOrderResponse) {
         String json = JSONUtil.toJsonStr(spsSyncOrderResponse);
-        String result = okHttpCli.doPostJson(getIpUrl() + "/busOrderApi/sps/sync/busOrder/upload", json);
+        String result = okHttpCli.doPostJson(getIpUrl() + "/busOrderApi/sps/sync/busOrder/upload", json, buildHeader());
         BaseResponse<String> response =
                 JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
                 });
@@ -60,7 +71,7 @@ public class SpGetHttpClient {
     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);
+        String response = okHttpCli.doGet(getIpUrl() + "/spms/inout/order/status", paramMap, buildHeader());
         try {
             BaseResponse<PageSimpleResponse<IOOrderStatusEntity>> data =
                     JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<IOOrderStatusEntity>>>() {
@@ -77,7 +88,7 @@ public class SpGetHttpClient {
     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);
+        String response = okHttpCli.doGet(getIpUrl() + "/spms/inout/order/dlByStatus", paramMap, buildHeader());
         try {
             BaseResponse<List<DlOrderResponse>> data =
                     JSONObject.parseObject(response, new TypeReference<BaseResponse<List<DlOrderResponse>>>() {
@@ -95,7 +106,7 @@ public class SpGetHttpClient {
         orderStatusFilterRequest.setOrderId(orderId);
         orderStatusFilterRequest.setStatus(2);
         String json = JSONUtil.toJsonStr(orderStatusFilterRequest);
-        String result = okHttpCli.doPostJson(getIpUrl() + "/spms/inout/order/updateStatus", json);
+        String result = okHttpCli.doPostJson(getIpUrl() + "/spms/inout/order/updateStatus", json, buildHeader());
         BaseResponse<String> response =
                 JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
                 });
@@ -107,7 +118,7 @@ public class SpGetHttpClient {
         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);
+        String response = okHttpCli.doGet(getIpUrl() + "/spssync/basic/udiinfo/getStatus", paramMap, buildHeader());
         try {
             BaseResponse<List<BasicExportStatusEntity>> data =
                     JSONObject.parseObject(response, new TypeReference<BaseResponse<List<BasicExportStatusEntity>>>() {
@@ -144,7 +155,7 @@ public class SpGetHttpClient {
             paramMap.put("id", basicExportStatusRequest.getId());
         if (basicExportStatusRequest.getScheduleType() != null)
             paramMap.put("scheduleType", basicExportStatusRequest.getScheduleType() + "");
-        String response = okHttpCli.doGet(getIpUrl() + "/spssync/basic/udiinfo/getStatus", paramMap);
+        String response = okHttpCli.doGet(getIpUrl() + "/spssync/basic/udiinfo/getStatus", paramMap, buildHeader());
         try {
             BaseResponse<List<BasicExportStatusEntity>> data =
                     JSONObject.parseObject(response, new TypeReference<BaseResponse<List<BasicExportStatusEntity>>>() {
@@ -163,7 +174,7 @@ public class SpGetHttpClient {
         basicExportStatusRequest.setId(id);
         basicExportStatusRequest.setType(type);
         String json = JSONUtil.toJsonStr(basicExportStatusRequest);
-        String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/basic/udiinfo/downloadByStatus", json);
+        String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/basic/udiinfo/downloadByStatus", json, buildHeader());
         return result;
     }
 
@@ -172,7 +183,7 @@ public class SpGetHttpClient {
         BasicExportStatusRequest basicStatusFilterRequest = new BasicExportStatusRequest();
         basicStatusFilterRequest.setId(id);
         String json = JSONUtil.toJsonStr(basicStatusFilterRequest);
-        String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/basic/udiinfo/deleteByStatus", json);
+        String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/basic/udiinfo/deleteByStatus", json, buildHeader());
         BaseResponse<String> response =
                 JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
                 });

src/main/java/com/glxp/api/service/inout/IoOrderService.java

@@ -7,6 +7,7 @@ import com.glxp.api.req.inout.FilterUploadOrderRequest;
 import com.glxp.api.req.inout.OrderEditRequest;
 import com.glxp.api.res.inout.IoOrderResponse;
 
+import java.util.Date;
 import java.util.List;
 
 public interface IoOrderService {
@@ -22,7 +23,7 @@ public interface IoOrderService {
 
     IoOrderEntity findByBillNo(String billNO);
 
-    List<IoOrderEntity> findByStatus(String action, Integer status);
+    List<IoOrderEntity> findByStatus(String action, Integer status, Date lastUpdateTime);
 
     int insertOrder(IoOrderEntity orderEntity);
 

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -138,8 +138,8 @@ public class IoOrderServiceImpl implements IoOrderService {
     }
 
     @Override
-    public List<IoOrderEntity> findByStatus(String action, Integer status) {
+    public List<IoOrderEntity> findByStatus(String action, Integer status, Date lastUpdateTime) {
-        return orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("action", action).eq("status", status));
+        return orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("action", action).eq("status", status).gt("updateTime", lastUpdateTime));
     }
 
     @Override

src/main/java/com/glxp/api/service/purchase/PurOrderService.java

@@ -9,14 +9,19 @@ import com.glxp.api.req.purchase.PurPlanRequest;
 import com.glxp.api.res.purchase.PurOrderResponse;
 import com.glxp.api.res.purchase.PurPlanResponse;
 
+import java.util.Date;
 import java.util.List;
 
 public interface PurOrderService {
+
+
+    PurOrderEntity selectByBillNo(String billNo);
+
     PurOrderEntity selectById(Long id);
 
     List<PurOrderResponse> queryPageList(PurOrderRequest purOrderRequest);
 
-    List<PurOrderEntity> findByStatus(String billType, Integer status);
+    List<PurOrderEntity> findByStatus(String billType, Integer status, Date lastUpdateTime);
 
     Boolean insert(PurOrderEntity purOrderEntity);
 

src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -30,6 +31,11 @@ public class PurOrderServiceImpl implements PurOrderService {
     @Resource
     PurOrderDao purOrderDao;
 
+    @Override
+    public PurOrderEntity selectByBillNo(String billNo) {
+        return purOrderDao.selectOne(new QueryWrapper<PurOrderEntity>().eq("billNo", billNo));
+    }
+
     @Override
     public PurOrderEntity selectById(Long id) {
         return purOrderDao.selectById(id);
@@ -49,8 +55,8 @@ public class PurOrderServiceImpl implements PurOrderService {
     }
 
     @Override
-    public List<PurOrderEntity> findByStatus(String billType, Integer status) {
+    public List<PurOrderEntity> findByStatus(String billType, Integer status, Date lastUpdateTime) {
-        return purOrderDao.selectList(new QueryWrapper<PurOrderEntity>().eq("billType", billType).eq("status", status));
+        return purOrderDao.selectList(new QueryWrapper<PurOrderEntity>().eq("billType", billType).eq("status", status).gt("updateTime", lastUpdateTime));
     }
 
     @Override

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -116,7 +116,7 @@ public class HeartService {
     public BaseResponse uploadAllBusOrder(String syncTime) {
         SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest();
         if (syncTime == null) {
-            BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_SCAN_ORDER);
+            BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_BUS_ORDER);
             if (basicExportStatusTimeEntity == null) {
                 basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
                 basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00");
@@ -132,12 +132,12 @@ public class HeartService {
             return ResultVOUtils.success("无数据");
         }
 
-        BasicExportStatusEntity basicExportStatusEntity1 = basicExportService.findByData(ConstantStatus.SYNC_SCAN_ORDER, 0);
+        BasicExportStatusEntity basicExportStatusEntity1 = basicExportService.findByData(ConstantStatus.SYNC_BUS_ORDER, 0);
         if (basicExportStatusEntity1 == null) {
             BasicExportStatusEntity orderStatusEntity = new BasicExportStatusEntity();
             orderStatusEntity.setId(CustomUtil.getId());
-            orderStatusEntity.setIdDatas(ConstantStatus.SYNC_SCAN_ORDER);
+            orderStatusEntity.setIdDatas(ConstantStatus.SYNC_BUS_ORDER);
-            orderStatusEntity.setType(BasicProcessStatus.NEW_ALL_ORDER);
+            orderStatusEntity.setType(BasicProcessStatus.ALL_BUS_ORDER);
             orderStatusEntity.setUpdateTime(new Date());
             orderStatusEntity.setStartTime(new Date());
             orderStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT);

src/main/java/com/glxp/api/service/sync/UpBasicService.java

@@ -16,6 +16,7 @@ import com.glxp.api.res.system.SyncDataSetResponse;
 import com.glxp.api.service.inout.*;
 import com.glxp.api.service.purchase.PurOrderDetailService;
 import com.glxp.api.service.purchase.PurOrderService;
+import com.glxp.api.util.DateUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -58,7 +59,7 @@ public class UpBasicService {
         BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest);
         if (CollUtil.isNotEmpty(syncDataSetEntity.getBusTypes())) {
             for (SyncDataBustypeEntity syncDataBustypeEntity : syncDataSetEntity.getBusTypes()) {
-                List<IoOrderEntity> temps = orderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus());
+                List<IoOrderEntity> temps = orderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus(), DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
                 if (CollUtil.isNotEmpty(temps)) {
                     orderEntities.addAll(temps);
                 }
@@ -120,7 +121,7 @@ public class UpBasicService {
         if (CollUtil.isNotEmpty(syncDataSetEntity.getChangeBusTypes())) {
             for (SyncDataChangeBustypesEntity syncDataChangeBustypesEntity : syncDataSetEntity.getChangeBusTypes()) {
                 if (syncDataChangeBustypesEntity.getAction().equals(ConstantStatus.BUS_ORDER_CGDD)) {
-                    List<PurOrderEntity> temps = purOrderService.findByStatus(syncDataChangeBustypesEntity.getAction(), syncDataChangeBustypesEntity.getOrderStatus());
+                    List<PurOrderEntity> temps = purOrderService.findByStatus(syncDataChangeBustypesEntity.getAction(), syncDataChangeBustypesEntity.getOrderStatus(), DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
                     if (CollUtil.isNotEmpty(temps)) {
                         purOrderEntities.addAll(temps);
                     }
@@ -131,7 +132,7 @@ public class UpBasicService {
         List<PurOrderDetailEntity> purOrderDetailEntities = new ArrayList<>();
         if (CollUtil.isNotEmpty(purOrderEntities)) {
             for (PurOrderEntity orderEntity : purOrderEntities) {
-                List<PurOrderDetailEntity> detailResultEntities = purOrderDetailService.findByOrderId(orderEntity.getBillNo());
+                List<PurOrderDetailEntity> detailResultEntities = purOrderDetailService.findByOrderId(orderEntity.getId() + "");
                 if (CollUtil.isNotEmpty(detailResultEntities)) {
                     purOrderDetailEntities.addAll(detailResultEntities);
                 }