TRX пре 1 година
родитељ
комит
eba99a996d

+ 15 - 0
src/main/java/com/zswl/dataservice/dao/payment/RequestInfoDao.java

@@ -0,0 +1,15 @@
+package com.zswl.dataservice.dao.payment;
+
+import com.zswl.dataservice.dao.MongoDao;
+import com.zswl.dataservice.domain.payment.RequestInfo;
+import com.zswl.dataservice.domain.user.AppInfo;
+
+/**
+ * @author TRX
+ * @date 2024/3/21
+ */
+public interface RequestInfoDao extends MongoDao<RequestInfo> {
+
+    RequestInfo findTopById(String id);
+
+}

+ 26 - 0
src/main/java/com/zswl/dataservice/domain/payment/RequestInfo.java

@@ -0,0 +1,26 @@
+package com.zswl.dataservice.domain.payment;
+
+import com.zswl.dataservice.domain.base.SuperEntity;
+import com.zswl.dataservice.type.RequestType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+/**
+ * 请求数据
+ *
+ * @author TRX
+ * @date 2024/6/25
+ */
+@Data
+@Document
+@NoArgsConstructor
+@AllArgsConstructor
+public class RequestInfo extends SuperEntity {
+    private Object param;
+    private Object response;
+    private String timeStr;
+    private Boolean isSuccess = Boolean.TRUE;
+    private RequestType requestType = RequestType.Common;
+}

+ 4 - 0
src/main/java/com/zswl/dataservice/model/payment/ServerTimeResult.java

@@ -1,6 +1,7 @@
 package com.zswl.dataservice.model.payment;
 
 import com.zswl.dataservice.model.payment.base.HxzBaseResult;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,7 +14,10 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class ServerTimeResult extends HxzBaseResult {
+    @Schema(description = "服务器时间")
     private String Time;
+    @Schema(description = "1:有白名单更新  0:无")
     private int WLUptate;
+    @Schema(description = "起始页数(当WLUptate为1却WLPage为0时 清除所有白名单)")
     private int WLPage;
 }

+ 6 - 2
src/main/java/com/zswl/dataservice/service/payment/HxzService.java

@@ -29,15 +29,18 @@ public class HxzService extends SuperService {
     @Autowired
     DeviceInfoDao deviceInfoDao;
 
+    @Autowired
+    RequestInfoService requestInfoService;
+
     public ServerTimeResult serverTime(ServerTimeModel param) {
         String deviceId = param.getDeviceID().toString();
         ServerTimeResult result = new ServerTimeResult();
         DeviceInfo deviceInfo = deviceInfoDao.findTopByDeviceId(deviceId);
-        if (ObjectUtils.isEmpty(deviceInfo)){
+        if (ObjectUtils.isEmpty(deviceInfo)) {
             result.setFailed("设备未注册");
+            requestInfoService.addRequestInfo(param, result);
             return result;
         }
-
         var nowTime = new Date(System.currentTimeMillis());
         LocalDate date = LocalDate.now();
         int week = Map.of(DayOfWeek.MONDAY, 1, DayOfWeek.TUESDAY, 2, DayOfWeek.WEDNESDAY, 3, DayOfWeek.THURSDAY, 4, DayOfWeek.FRIDAY, 5, DayOfWeek.SATURDAY, 6, DayOfWeek.SUNDAY, 0).get(date.getDayOfWeek());
@@ -46,6 +49,7 @@ public class HxzService extends SuperService {
         result.setWLPage(0);
         result.setWLUptate(0);
         log.info("ServerTime : {} - {}", result);
+        requestInfoService.addRequestInfo(param, result);
         return result;
     }
 }

+ 40 - 0
src/main/java/com/zswl/dataservice/service/payment/RequestInfoService.java

@@ -0,0 +1,40 @@
+package com.zswl.dataservice.service.payment;
+
+import com.zswl.dataservice.dao.payment.RequestInfoDao;
+import com.zswl.dataservice.domain.payment.RequestInfo;
+import com.zswl.dataservice.model.payment.base.HxzBaseResult;
+import com.zswl.dataservice.type.RequestType;
+import com.zswl.dataservice.utils.DateUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author TRX
+ * @date 2024/6/25
+ */
+@Slf4j
+@Service
+public class RequestInfoService {
+
+    @Autowired
+    RequestInfoDao requestInfoDao;
+
+    /**
+     * 添加 HXZ 请求日志
+     *
+     * @param param
+     * @param response
+     * @return
+     */
+    public boolean addRequestInfo(Object param, HxzBaseResult response) {
+        RequestInfo requestInfo = new RequestInfo();
+        requestInfo.setParam(param);
+        requestInfo.setResponse(response);
+        requestInfo.setIsSuccess(response.isSuccess());
+        requestInfo.setTimeStr(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));
+        requestInfo.setRequestType(RequestType.HXZ);
+        requestInfoDao.save(requestInfo);
+        return true;
+    }
+}

+ 19 - 0
src/main/java/com/zswl/dataservice/type/RequestType.java

@@ -0,0 +1,19 @@
+package com.zswl.dataservice.type;
+
+import lombok.Getter;
+
+/**
+ * 请求类型
+ */
+public enum RequestType {
+    HXZ("云版消费机"),
+    Common("普通"),
+    ;
+
+    @Getter
+    private String remark;
+
+    RequestType(String remark) {
+        this.remark = remark;
+    }
+}