com.deepoove
poi-tl
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java
index 275931f..4eda3dc 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java
@@ -10,7 +10,6 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SubmitAnswerBo;
import org.dromara.scale.domain.vo.QuestionAnswerVo;
-import org.dromara.scale.domain.vo.SysScalePublishVo;
import org.dromara.scale.domain.vo.SysScaleVo;
import org.dromara.scale.service.IWebService;
import org.springframework.validation.annotation.Validated;
@@ -29,7 +28,7 @@ import java.util.Map;
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/web/scale")
+@RequestMapping("/wx")
public class WebController extends BaseController {
private final IWebService webService;
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxPayController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxPayController.java
new file mode 100644
index 0000000..1f4a3f9
--- /dev/null
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxPayController.java
@@ -0,0 +1,21 @@
+package org.dromara.scale.controller.wx;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * TODO
+ *
+ * @author cjw
+ * @version V1.0.0
+ * @date 2024/7/29 14:08
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wx/pay")
+public class WxPayController {
+
+}
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java
new file mode 100644
index 0000000..02e200c
--- /dev/null
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java
@@ -0,0 +1,50 @@
+package org.dromara.scale.controller.wx;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.scale.domain.bo.SysScaleBo;
+import org.dromara.scale.domain.vo.SysScaleVo;
+import org.dromara.scale.service.ISysScaleService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
TODO
+ *
+ * @author cjw
+ * @version V1.0.0
+ * @date 2024/7/29 10:01
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wx/scale")
+public class WxScaleController extends BaseController {
+
+ private final ISysScaleService sysScaleService;
+
+ /**
+ * 查询心理测评量列表
+ */
+ @GetMapping("/pageList")
+ public TableDataInfo list(SysScaleBo bo, PageQuery pageQuery) {
+ return sysScaleService.queryPageList(bo, pageQuery);
+ }
+ /**
+ * 获取心理测评量详细信息
+ *
+ * @param scaleId 主键
+ */
+ @GetMapping("/{scaleId}")
+ public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long scaleId) {
+ //todo
+ return R.ok(sysScaleService.queryById(scaleId));
+ }
+}
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java
index ddfbd2d..0be70a4 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java
@@ -10,6 +10,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.vo.SysScaleVo;
import java.io.Serial;
+import java.math.BigDecimal;
/**
* 心理测评量对象 sys_scale
@@ -110,4 +111,8 @@ public class SysScale extends BaseEntity {
*/
private String scaleTime;
+ private Integer freeFlag;
+
+ private BigDecimal price;
+
}
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java
index bfd138d..74373c3 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java
@@ -13,6 +13,7 @@ import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.SysScale;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -116,4 +117,9 @@ public class SysScaleBo extends BaseEntity {
*/
@NotBlank(message = "测评时长不能为空", groups = {AddGroup.class, EditGroup.class})
private String scaleTime;
+
+ @NotNull(message = "价格类型不能为空", groups = {AddGroup.class, EditGroup.class})
+ private Integer freeFlag;
+
+ private BigDecimal price;
}
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java
index d99a65b..269d150 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java
@@ -4,6 +4,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.List;
@@ -118,4 +119,8 @@ public class SysScaleVo implements Serializable {
private Long recordId;
+ private Integer freeFlag;
+
+ private BigDecimal price;
+
}
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/starter/ApplicationStarter.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/starter/ApplicationStarter.java
index 1cb64b8..83ba01b 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/starter/ApplicationStarter.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/starter/ApplicationStarter.java
@@ -1,6 +1,7 @@
package org.dromara.scale.starter;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.dromara.common.redis.utils.QueueUtils;
import org.dromara.scale.constant.StatusEnum;
import org.dromara.scale.domain.SysScalePublish;
@@ -16,6 +17,7 @@ import org.springframework.stereotype.Component;
* @version V1.0.0
* @date 2024/4/15 15:08
*/
+@Slf4j
@Component
@RequiredArgsConstructor
@Order(value = 99)
@@ -29,6 +31,7 @@ public class ApplicationStarter implements CommandLineRunner {
}
private void subscribeRedisDelayedQueue(){
+ log.info("=======================延迟队列回调开始===============");
// 项目初始化设置一次即可
QueueUtils.subscribeBlockingQueue("endPublish-delay-queue", (Long batchNo) -> {
SysScalePublish publish = new SysScalePublish();
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java
index f644a32..38cb6e5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java
@@ -42,6 +42,8 @@ public class SysUser extends TenantEntity {
*/
private String nickName;
+ private String openId;
+
/**
* 用户类型（sys_user系统用户）
*/
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
index d1f4059..8cae7b6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
@@ -48,6 +48,8 @@ public class SysUserVo implements Serializable {
*/
private String userName;
+ private String openId;
+
/**
* 用户昵称
*/