Merge branch 'test'

src/main/java/com/fdkankan/ucenter/common/SceneEnum.java

@@ -38,11 +38,11 @@ public enum SceneEnum {
         this.sceneSource = sceneSource;
     }
 
-    public Integer getObj() {
+    public Integer getIsObj() {
         return isObj;
     }
 
-    public void setObj(Integer obj) {
+    public void setIsObj(Integer obj) {
         isObj = obj;
     }
 
@@ -66,7 +66,7 @@ public enum SceneEnum {
         for (SceneEnum value : values) {
 
             if(SceneSourceUtil.isLaser(sceneSource)){
-                if(value.getSceneSource().contains(sceneSource) && value.getObj().equals(isObj)){
+                if(value.getSceneSource().contains(sceneSource) && value.getIsObj().equals(isObj)){
                     return value;
                 }
             }else {
@@ -98,7 +98,4 @@ public enum SceneEnum {
         return null;
     }
 
-    public static void main(String[] args) {
-        System.out.println(getKeys());
-    }
 }

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -190,8 +190,20 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             sceneNumVo.setSceneNum( sceneNumVo.getSceneNum() + vo.getSceneNum() );
             sceneNumVo.setCooperationSceneNum( sceneNumVo.getCooperationSceneNum() + vo.getCooperationSceneNum() );
             sceneNumVo.setTotalNum(sceneNumVo.getSceneNum() + sceneNumVo.getCooperationSceneNum());
+            sceneNumVo.setIsObj(sceneEnum.getIsObj());
             hashMap.put(sceneEnum.getName(),sceneNumVo);
         }
+
+        for (String key : hashMap.keySet()) {
+            SceneNumVo sceneNumVo = hashMap.get(key);
+            if(sceneNumVo.getIsObj() != null && sceneNumVo.getIsObj()==0){
+                SceneNumVo sceneNumVo1 = hashMap.get(key + "_OBJ");
+                if(sceneNumVo1 != null){
+                    sceneNumVo.setSceneNum(sceneNumVo.getSceneNum() + sceneNumVo1.getSceneNum());
+                    sceneNumVo.setTotalNum(sceneNumVo.getSceneNum() + sceneNumVo.getCooperationSceneNum());
+                }
+            }
+        }
         return hashMap;
     }
 

src/main/resources/mapper/ucenter/SceneCooperationMapper.xml

@@ -23,19 +23,28 @@
     </select>
 
     <select id="getGroupCooperationSceneProNum" resultType="com.fdkankan.ucenter.vo.response.SceneNumVo">
-        SELECT scene_source as type,count(0) as cooperationSceneNum,is_obj FROM t_scene_cooperation a
+        SELECT scene_source as type,count(0) as cooperationSceneNum,
+               CASE
+                   WHEN a.scene_type = "mesh" THEN 1
+                   WHEN a.scene_type = "laser" THEN 0
+                   END  as isObj
+        FROM t_scene_cooperation a
         LEFT JOIN t_scene_pro b ON a.scene_num = b.num
         WHERE a.rec_status = 'A' AND b.rec_status = 'A' AND b.is_upgrade = 0
         AND a.user_id = #{userId}
-        group by scene_source,is_obj
+        group by scene_source,isObj
     </select>
     <select id="getGroupCooperationScenePlusNum" resultType="com.fdkankan.ucenter.vo.response.SceneNumVo">
-        SELECT scene_source as type,count(0) as cooperationSceneNum ,e.is_obj FROM t_scene_cooperation a
-        LEFT JOIN t_scene_plus b ON a.scene_num = b.num
-        Left Join t_scene_plus_ext e on b.id = e.plus_id
+        SELECT scene_source as type,count(0) as cooperationSceneNum ,
+               CASE
+                   WHEN a.scene_type = "mesh" THEN 1
+                   WHEN a.scene_type = "laser" THEN 0
+               END  as isObj
+        FROM t_scene_cooperation a
+                 LEFT JOIN t_scene_plus b ON a.scene_num = b.num
         WHERE a.rec_status = 'A' AND b.rec_status = 'A'
-        AND a.user_id = #{userId}
-        group by scene_source,is_obj
+          AND a.user_id = #{userId}
+        group by scene_source,isObj
 
     </select>
 </mapper>