Merge remote-tracking branch 'origin/master'

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/api/ReturnResult.java

@@ -78,7 +78,14 @@ public class ReturnResult implements IResult{
         result.setData(data);
         return result;
     }
+    public static ReturnResult success (Boolean success, String message, Object data) {
+        ReturnResult result = success();
+        result.success = success;
+        result.message = message;
+        result.data = data;
 
+        return result;
+    }
     public static ReturnResult failure(ResultCodeEnum resultCodeEnum) {
         ReturnResult result = new ReturnResult();
         result.setResultCode(resultCodeEnum);

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/controller/v1/TermEventsController.java

@@ -0,0 +1,34 @@
+package org.dromara.server.consume.controller.v1;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.api.ReturnResult;
+import org.dromara.server.consume.domain.XfTermEvents;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 消费机事件控制器
+ * <p>
+ *
+ * @author luoyibo
+ * @date 2025-06-27
+ * @since JDK17
+ */
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(path = {"/v1/xfTermEvent"})
+public class TermEventsController {
+    @PostMapping({"/uploadRecord"})
+    public Object uploadRecord(@RequestBody XfTermEvents termEvents) {
+        // TO DO 这里面实际应该入库，暂时默认成功返回给前端
+        ReturnResult result = ReturnResult.success(true, "入库成功！", termEvents.getEventId());
+        return new ResponseEntity<>(result, (MultiValueMap) null, HttpStatus.OK);
+    }
+}

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/domain/XfTermEvents.java

@@ -0,0 +1,32 @@
+package org.dromara.server.consume.domain;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 消费机上报事件类
+ * <p>
+ * [功能说明]
+ * ${1:在此简要描述文件核心功能}
+ *
+ * @author luoyibo
+ * @date 2025-06-27
+ * @since JDK17
+ */
+@Data
+public class XfTermEvents implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 558348315487098356L;
+
+    private String recordId;
+    private String eventId;
+    private Integer termNo;
+    private String eventCode;
+    private Date eventTime;
+    private String eventDetail;
+    private Date createTime;
+}

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/task/InitTasks.java

@@ -32,14 +32,14 @@ public class InitTasks implements ApplicationRunner {
     public void run(ApplicationArguments args) throws Exception {
         log.info("初始化消费验证基础数据");
         long startTime = System.currentTimeMillis();
-        initBusiness.initGlobalData();
-        initBusiness.initTermInfo();
-        initBusiness.initMealTypeInfo();
-        initBusiness.initDiscountAndOther();
-        initBusiness.initUserCard();
-        initBusiness.initUserAccount();
-        initBusiness.initXfCardLimited();
-        initBusiness.initUserBalance();
+        // initBusiness.initGlobalData();
+        // initBusiness.initTermInfo();
+        // initBusiness.initMealTypeInfo();
+        // initBusiness.initDiscountAndOther();
+        // initBusiness.initUserCard();
+        // initBusiness.initUserAccount();
+        // initBusiness.initXfCardLimited();
+        // initBusiness.initUserBalance();
         validationParam.refresh();
 
         log.info("初始化消费验证基础数据完成。耗时：{} ms", System.currentTimeMillis() - startTime);