lyhzzz 5 天之前
父節點
當前提交
e5dd2da235

+ 11 - 1
src/main/java/com/fdkankan/ucenter/common/SceneEnum.java

@@ -20,6 +20,8 @@ public enum SceneEnum {
 
     private Integer isObj;
 
+
+
     public String getName() {
         return name;
     }
@@ -68,7 +70,15 @@ public enum SceneEnum {
         }
         return null;
     }
-
+    public static SceneEnum getKey(String key) {
+        SceneEnum[] values = SceneEnum.values();
+        for (SceneEnum value : values) {
+            if(value.getName().equals(key) ){
+                return value;
+            }
+        }
+        return null;
+    }
 
     public static void main(String[] args) {
         System.out.println(getKeys());

+ 11 - 3
src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -167,9 +167,17 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         List<SceneNumVo> groupBySceneSouceV4 = scenePlusService.getGroupBySceneSouceV4(user.getId());
         groupBySceneSouceV4.addAll(groupBySceneSouceV3);
 
-        List<String> keys = SceneEnum.getKeys();
-        for (String key : keys) {
-            hashMap.put(key,new SceneNumVo());
+        SceneEnum[] values = SceneEnum.values();
+        for (SceneEnum sceneEnum : values) {
+            if(sceneEnum.getObj() == 0){
+                SceneNumVo sceneNumVo1 = fdkkLaserService.getLaserSceneNumByUser(token, sceneEnum.getSceneSource().get(0));
+                hashMap.put(sceneEnum.getName(),sceneNumVo1);
+            }else {
+                Long cooperationSceneNum = sceneCooperationService.getCooperationSceneNum(user.getId(), sceneEnum.getSceneSource());
+                SceneNumVo vo = new SceneNumVo();
+                vo.setCooperationSceneNum(cooperationSceneNum);
+                hashMap.put(sceneEnum.getName(),vo);
+            }
         }
 
         for (SceneNumVo vo : groupBySceneSouceV4) {