lvzhiqiang 2 سال پیش
والد
کامیت
14f2adbf44
2فایلهای تغییر یافته به همراه55 افزوده شده و 11 حذف شده
  1. 41 0
      src/main/java/top/lvzhiqiang/req/BasePageReq.java
  2. 14 11
      src/main/java/top/lvzhiqiang/service/impl/CoinServiceImpl.java

+ 41 - 0
src/main/java/top/lvzhiqiang/req/BasePageReq.java

@@ -0,0 +1,41 @@
+package top.lvzhiqiang.req;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Positive;
+
+/**
+ * 基础分页查询类{其他有DeleteReq|ExportReq|PageReq|RemoveReq|UpdateReq|ValidateReq}
+ *
+ * @author ziyan.li
+ * @since 13:50 2021/10/27
+ */
+@Data
+@NoArgsConstructor
+public class BasePageReq {
+    /**
+     * 页码
+     */
+    @NotNull(message = "页码不能为空")
+    @Positive(message = "页码必须为正数")
+    private Integer pageNum;
+
+    /**
+     * 页大小
+     */
+    @NotNull(message = "页大小不能为空")
+    @Positive(message = "页大小必须为正数")
+    private Integer pageSize;
+
+    /**
+     * 排序字段
+     */
+    private String sort;
+
+    /**
+     * 顺序
+     */
+    private String order;
+}

+ 14 - 11
src/main/java/top/lvzhiqiang/service/impl/CoinServiceImpl.java

@@ -142,22 +142,25 @@ public class CoinServiceImpl implements CoinService {
                 // 全部历史委托监控
                 Map<String, String> paramMap = new LinkedHashMap<>();
                 paramMap.put("productType", "umcbl");
-                paramMap.put("startTime", String.valueOf(DateUtils.localDateTimeToMilliseconds(endTime.minusSeconds(10))));
+                paramMap.put("startTime", String.valueOf(DateUtils.localDateTimeToMilliseconds(endTime.minusMinutes(1))));
                 paramMap.put("endTime", String.valueOf(DateUtils.localDateTimeToMilliseconds(endTime)));
                 paramMap.put("pageSize", "100");
 
                 String signQueryString = paramMap.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.joining("&"));
-                JSONObject response = requestApi4Common("/api/mix/v1/order/historyProductType", signQueryString, null, JsoupUtil.HTTP_GET, paramMap);
-                JSONArray orderList = response.getJSONObject("data").getJSONArray("orderList");
-
-                for (int i = 0; i < orderList.size(); i++) {
-                    JSONObject order = orderList.getJSONObject(i);
-                    LocalDateTime cTime = DateUtils.longToLocalDateTime(order.getLong("cTime"));
-                    String orderId = order.getString("orderId");
-                    if (Duration.between(cTime, endTime).getSeconds() < 5 && !orderMap.containsKey(orderId)) {
-                        orderMap.put(orderId, "1");
-                        SpringUtils.getBean(CoinServiceImpl.class).monitorAlarm(order);
+                try {
+                    JSONObject response = requestApi4Common("/api/mix/v1/order/historyProductType", signQueryString, null, JsoupUtil.HTTP_GET, paramMap);
+                    JSONArray orderList = response.getJSONObject("data").getJSONArray("orderList");
+
+                    for (int i = 0; i < orderList.size(); i++) {
+                        JSONObject order = orderList.getJSONObject(i);
+                        LocalDateTime cTime = DateUtils.longToLocalDateTime(order.getLong("cTime"));
+                        String orderId = order.getString("orderId");
+                        if (Duration.between(cTime, endTime).getSeconds() < 50 && !orderMap.containsKey(orderId)) {
+                            orderMap.put(orderId, "1");
+                            SpringUtils.getBean(CoinServiceImpl.class).monitorAlarm(order);
+                        }
                     }
+                } catch (Exception e) {
                 }
             }
         }, 0, 2000);