From a5a81680ca546fdec92d6bb9eea3f2311d69da03 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 17 Apr 2025 17:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B9=96=E5=88=86=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UserContributionController.java           |  6 ++-
 .../UserContributionController.java           | 50 +++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/peanut/modules/common/controller/UserContributionController.java b/src/main/java/com/peanut/modules/common/controller/UserContributionController.java
index cf9b4196..b1b3132c 100644
--- a/src/main/java/com/peanut/modules/common/controller/UserContributionController.java
+++ b/src/main/java/com/peanut/modules/common/controller/UserContributionController.java
@@ -33,10 +33,14 @@ public class UserContributionController {
     public R getUserContribution(){
         Integer userId = ShiroUtils.getUId();
         //各分类总分
-        MPJLambdaWrapper wrapper = new MPJLambdaWrapper();
+        MPJLambdaWrapper<UserContribution> wrapper = new MPJLambdaWrapper();
+        wrapper.leftJoin(com.peanut.modules.book.entity.SysDictDataEntity.class,
+                com.peanut.modules.book.entity.SysDictDataEntity::getDictType,UserContribution::getType);
+        wrapper.eq(com.peanut.modules.book.entity.SysDictDataEntity::getDictLabel,"userContributionLabel");
         wrapper.eq("user_id",userId);
         wrapper.select("type");
         wrapper.select("sum(score) as score");
+        wrapper.select(com.peanut.modules.book.entity.SysDictDataEntity::getDictValue);
         wrapper.groupBy("type");
         List contributions = contributionService.listMaps(wrapper);
         //统计总分
diff --git a/src/main/java/com/peanut/modules/master/controller/UserContributionController.java b/src/main/java/com/peanut/modules/master/controller/UserContributionController.java
index f6a5a5a1..50c9564f 100644
--- a/src/main/java/com/peanut/modules/master/controller/UserContributionController.java
+++ b/src/main/java/com/peanut/modules/master/controller/UserContributionController.java
@@ -1,12 +1,15 @@
 package com.peanut.modules.master.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.R;
+import com.peanut.modules.book.entity.SysDictDataEntity;
 import com.peanut.modules.common.entity.MyUserEntity;
 import com.peanut.modules.common.entity.UserContribution;
 import com.peanut.modules.master.service.MyUserService;
 import com.peanut.modules.master.service.UserContributionService;
+import com.peanut.modules.sys.service.SysDictDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +32,53 @@ public class UserContributionController {
     private UserContributionService contributionService;
     @Autowired
     private MyUserService userService;
+    @Autowired
+    private SysDictDataService sysDictDataService;
+
+    //湖分标签列表
+    @RequestMapping("/getUserContributionLabelList")
+    public R getUserContributionLabelList() {
+        List labelList = sysDictDataService.list(new LambdaQueryWrapper<SysDictDataEntity>()
+                .eq(SysDictDataEntity::getDictLabel,"userContributionLabel")
+                .orderByAsc(SysDictDataEntity::getSort));
+        return R.ok().put("labelList",labelList);
+    }
+
+    //新增湖分标签
+    @RequestMapping("/addUserContributionLabelList")
+    public R addUserContributionLabelList(@RequestBody SysDictDataEntity sysDictDataEntity) {
+        sysDictDataEntity.setDictLabel("userContributionLabel");
+        List<SysDictDataEntity> labelList = sysDictDataService.list(new LambdaQueryWrapper<SysDictDataEntity>()
+                .eq(SysDictDataEntity::getDictLabel,"userContributionLabel")
+                .orderByDesc(SysDictDataEntity::getDictType));
+        if (labelList.size() > 0){
+            sysDictDataEntity.setDictType(Integer.valueOf(labelList.get(0).getDictType())+1+"");
+        }else {
+            sysDictDataEntity.setDictType("1");
+        }
+        sysDictDataService.save(sysDictDataEntity);
+        return R.ok();
+    }
+
+    //修改湖分标签
+    @RequestMapping("/editUserContributionLabelList")
+    public R editUserContributionLabelList(@RequestBody SysDictDataEntity sysDictDataEntity) {
+        sysDictDataService.updateById(sysDictDataEntity);
+        return R.ok();
+    }
+
+    //删除湖分标签
+    @RequestMapping("/delUserContributionLabelList")
+    public R delUserContributionLabelList(@RequestBody Map<String, Object> params) {
+        SysDictDataEntity sysDictDataEntity = sysDictDataService.getById(params.get("id").toString());
+        int count = contributionService.count(new LambdaQueryWrapper<UserContribution>()
+                .eq(UserContribution::getType,sysDictDataEntity.getDictType()));
+        if (count > 0){
+            return R.error("已存在湖分记录");
+        }
+        sysDictDataService.removeById(params.get("id").toString());
+        return R.ok();
+    }
 
     @RequestMapping("/listByPage")
     public R listByPage(@RequestBody Map<String, Object> params) {