From 26a59af2b734a2bc4aafe100e02d04d37b1266ed Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Mon, 5 May 2025 21:43:53 +0800
Subject: [PATCH] updates

---
 .../mini/controller/MiniMajorController.java  | 26 +++++++------------
 .../service/impl/YxUserScoreServiceImpl.java  | 12 ++++-----
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java
index fffae39..dab1505 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java
@@ -114,23 +114,17 @@ public class MiniMajorController {
             dataList = JSONArray.parseArray(json, Map.class);
         } else {
             String str = null;
-            List<String> notList= Arrays.asList("文7专3","专过文排","文8专2","文6专4","文5专5");
-            if (queryRecommendMajorVO.getProfessionalCategory().equals("音乐类")) {
-                str = "[\"文过专排主科\",\"文过专排\",\"专过文排\",\"文1专1\",\"文3专7\",\"文3专10\",\"文4专10\",\"文4专6\",\"文5专10\",\"文5专5\",\"文6专10\",\"文6专4\",\"文7专3\",\"文8专2\"]";
-            } else if (queryRecommendMajorVO.getProfessionalCategory().equals("体育类")) {
-                str = "[\"专过文排\",\"文7专3\" ,\"文5专5\",\"文3专7\",\"文过专排\"]";
-            } else {
-                str = "[\"文过专排\",\"专过文排\",\"文1专1\",\"文3专7\",\"文3专10\",\"文4专10\",\"文4专6\",\"文5专10\",\"文5专5\",\"文6专10\",\"文6专4\",\"文7专3\",\"文8专2\"]";
-            }//277
-            JSONArray objects = JSONArray.parseArray(str);
-            List<String> javaList = objects.toJavaList(String.class);
-            for (String s : javaList) {
+            List<String> notList= Arrays.asList("专过文排","文8专2","文7专3","文6专4","文5专5");
+            if (queryRecommendMajorVO.getProfessionalCategory().equals("体育类")) {
+                 notList = Arrays.asList("专过文排", "文过专排", "文3专7", "文5专5", "文7专3");
+            }
+//            JSONArray objects = JSONArray.parseArray(str);
+//            List<String> javaList = objects.toJavaList(String.class);
+            for (String s : notList) {
                 data = new LinkedHashMap<>();
-                if (notList.contains(s)) {
-                    data.put("label", s);
-                    data.put("value", s);
-                    dataList.add(data);
-                }
+                data.put("label", s);
+                data.put("value", s);
+                dataList.add(data);
             }
             json = JSONObject.toJSONString(dataList);
             redisUtil.set(key, json, 3600);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxUserScoreServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxUserScoreServiceImpl.java
index d9cbbca..2cd555b 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxUserScoreServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxUserScoreServiceImpl.java
@@ -58,12 +58,12 @@ public class YxUserScoreServiceImpl extends ServiceImpl<YxUserScoreMapper, YxUse
         AssertUtils.notNull(sysUser,"请先登录!");
         String userId = sysUser.getId();
         // 获取redis中的成绩缓存
-        String scoreKey = "USER:SCORE:"+ userId;
+//        String scoreKey = "USER:SCORE:"+ userId;
         YxUserScore userScore = null;
-        if(redisUtil.hasKey(scoreKey)){
-            userScore = JSONObject.parseObject((String)redisUtil.get(scoreKey), YxUserScore.class);
-            return userScore;
-        }
+//        if(redisUtil.hasKey(scoreKey)){
+//            userScore = JSONObject.parseObject((String)redisUtil.get(scoreKey), YxUserScore.class);
+//            return userScore;
+//        }
         //查询成绩
         userScore = getActiveUserScore(userId);
         if (userScore==null) {
@@ -96,7 +96,7 @@ public class YxUserScoreServiceImpl extends ServiceImpl<YxUserScoreMapper, YxUse
             userScore.setProfessionalCategoryChildrenList(professionalCategoryChildrenList);
 
             // 将成绩记录缓存
-            redisUtil.set(scoreKey, JSONObject.toJSONString(userScore), 3600);
+//            redisUtil.set(scoreKey, JSONObject.toJSONString(userScore), 3600);
         }
         return userScore;
     }