首页新增不分页接口。支付配置

ruoyi-admin/src/main/resources/application-dev.yml

@@ -261,10 +261,8 @@ wx:
   pay:
     appId: wx2e09db4124332242
     mchId: 1646701170
-    mchKey: #微信支付商户密钥
-    subAppId: #服务商模式下的子商户公众账号ID
-    subMchId: #服务商模式下的子商户号
-    keyPath: # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
+    mchKey: Mozhekejiyouxiangongsi6296296296
+    keyPath: /usr/local/mental/cert
   miniapp:
     configs:
       - appid: wx2e09db4124332242

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java

@@ -44,6 +44,15 @@ public class WxScaleController extends BaseController {
         return sysScaleService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 查询心理测评量列表
+     */
+    @GetMapping("/typeList")
+    public R<List<SysScaleVo>> pageListTest(SysScaleBo bo) {
+        bo.setOrderBy("num");
+        return R.ok(sysScaleService.queryPageListType(bo));
+    }
+
     /**
      * 查询心理测评量列表,默认展示两条数据
      */

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java

@@ -1,6 +1,9 @@
 package org.dromara.scale.domain.vo;
 
+import io.github.linpeilie.annotations.AutoMapping;
 import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -80,7 +83,12 @@ public class SysScaleVo implements Serializable {
     /**
      * 封面地址
      */
+    @Translation(type = TransConstant.OSS_ID_TO_URL)
+    @AutoMapping(target = "cover")
     private String coverUrl;
+
+    @Translation(type = TransConstant.OSS_ID_TO_URL)
+    @AutoMapping(target = "appCover")
     private String appCoverUrl;
 
     /**

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java

@@ -27,6 +27,8 @@ public interface ISysScaleService {
      */
     TableDataInfo<SysScaleVo> queryPageList(SysScaleBo bo, PageQuery pageQuery);
 
+    List<SysScaleVo> queryPageListType(SysScaleBo bo);
+
     /**
      * 查询心理测评量列表
      */

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java

@@ -18,7 +18,6 @@ import org.dromara.scale.domain.vo.SysScaleVo;
 import org.dromara.scale.mapper.ScoreRecordMapper;
 import org.dromara.scale.mapper.SysScaleMapper;
 import org.dromara.scale.service.ISysScaleService;
-import org.dromara.system.domain.SysOss;
 import org.dromara.system.domain.vo.SysDictDataVo;
 import org.dromara.system.mapper.SysDictDataMapper;
 import org.dromara.system.mapper.SysOssMapper;
@@ -80,15 +79,29 @@ public class SysScaleServiceImpl implements ISysScaleService {
 
             List<SysDictDataVo> peopleTypeList = sysDictDataMapper.selectDictDataByTypeAndDictValue("people_type", StrUtil.join(StrUtil.COMMA, record.getPeopleType()));
             record.setPeopleTypeName(peopleTypeList.stream().map(SysDictDataVo::getDictLabel).collect(Collectors.toList()));
-
-            SysOss cover = sysOssMapper.selectById(record.getCover());
-            record.setCoverUrl(cover.getUrl());
-            SysOss appCover = sysOssMapper.selectById(record.getAppCover());
-            record.setAppCoverUrl(appCover.getUrl());
         }
         return TableDataInfo.build(result);
     }
 
+    @Override
+    public List<SysScaleVo> queryPageListType(SysScaleBo bo) {
+        LambdaQueryWrapper<SysScale> lqw = buildQueryWrapper(bo);
+        if ("num".equals(bo.getOrderBy())) {
+            lqw.orderByDesc(SysScale::getPublishNums);
+        } else {
+            lqw.orderByDesc(SysScale::getUpdateTime);
+        }
+        List<SysScaleVo> result = baseMapper.selectVoList(lqw);
+        for (SysScaleVo record : result) {
+            List<SysDictDataVo> scaleTypeList = sysDictDataMapper.selectDictDataByTypeAndDictValue("scale_type", StrUtil.join(StrUtil.COMMA, record.getScaleType()));
+            record.setScaleTypeName(scaleTypeList.stream().map(SysDictDataVo::getDictLabel).collect(Collectors.toList()));
+
+            List<SysDictDataVo> peopleTypeList = sysDictDataMapper.selectDictDataByTypeAndDictValue("people_type", StrUtil.join(StrUtil.COMMA, record.getPeopleType()));
+            record.setPeopleTypeName(peopleTypeList.stream().map(SysDictDataVo::getDictLabel).collect(Collectors.toList()));
+        }
+        return result;
+    }
+
     /**
      * 查询心理测评量列表
      */