1

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

@@ -132,33 +132,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     public HashMap<String, SceneNumVo> findSceneNumber(String token) {
         HashMap<String, SceneNumVo> hashMap = new HashMap<>();
         User user = userService.getByUserName(JwtUtil.getUsername(token));
-//        SceneNumVo sceneNumVoKk = getSceneNumVoByType(Arrays.asList(1,2,12,13,14), user.getId());
-//        Integer oldNum = sceneService.getCountByUserId(user.getId());
-//        sceneNumVoKk.setSceneNum( oldNum + sceneNumVoKk.getSceneNum());
-//        sceneNumVoKk.setTotalNum(oldNum + sceneNumVoKk.getTotalNum());
-//
-//        SceneNumVo sceneNumVoKj = getSceneNumVoByType(Collections.singletonList(3), user.getId());
-//
-//        SceneNumVo sceneNumVoSS = fdkkLaserService.getLaserSceneNumByUser(token,4);
-//        SceneNumVo sceneNumVoSSObj = getSceneNumVoByObjType(Arrays.asList(4), user.getId());
-//
-//        SceneNumVo sceneNumVoSG = fdkkLaserService.getLaserSceneNumByUser(token,5);
-//        SceneNumVo sceneNumVoSGObj = getSceneNumVoByObjType(Arrays.asList(5), user.getId());
-//
-//        SceneNumVo sceneNumVoE57 = fdkkLaserService.getLaserSceneNumByUser(token,57);
-//        SceneNumVo sceneNumVoE57Obj = getSceneNumVoByObjType(Arrays.asList(57), user.getId());
-//
-//        SceneNumVo sceneNumVoSX = fdkkLaserService.getLaserSceneNumByUser(token,7);
-//        hashMap.put("kk",sceneNumVoKk);
-//        hashMap.put("kJ",sceneNumVoKj);
-//        hashMap.put("SS",sceneNumVoSS);
-//        hashMap.put("SS_OBJ",sceneNumVoSSObj);
-//        hashMap.put("SG",sceneNumVoSG);
-//        hashMap.put("SG_OBJ",sceneNumVoSGObj);
-//        hashMap.put("e57",sceneNumVoE57);
-//        hashMap.put("e57_OBJ",sceneNumVoE57Obj);
-//        hashMap.put("sx",sceneNumVoSX);
-
 
         List<SceneNumVo> groupBySceneSouceV3 = scenePlusService.getGroupBySceneSouceV3(user.getId());
         List<SceneNumVo> groupBySceneSouceV4 = scenePlusService.getGroupBySceneSouceV4(user.getId());
@@ -229,24 +202,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         sceneNumVo.setTotalNum(sceneNumVo.getSceneNum() + sceneNumVo.getCooperationSceneNum());
         return sceneNumVo;
     }
-    private SceneNumVo getSceneNumVoByObjType(List<Integer> sceneSourceList, Long userId){
-        SceneNumVo sceneNumVo = new SceneNumVo();
-        LambdaQueryWrapper<ScenePro> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ScenePro::getUserId, userId);
-        queryWrapper.in(ScenePro::getSceneSource, sceneSourceList);
-        queryWrapper.eq(ScenePro::getIsUpgrade, 0);
-        queryWrapper.eq(ScenePro::getIsObj,1);
-        Integer sceneNum = Math.toIntExact(this.count(queryWrapper));
-        List<ScenePlus> scenePlusList = scenePlusService.getCountByUserIdAndSceneSource(userId,sceneSourceList,1);
-
-        long plusCount = scenePlusList.size();
-        Long cooperNum = sceneCooperationService.getCooperationSceneNum(userId, sceneSourceList);
-
-        sceneNumVo.setCooperationSceneNum(cooperNum);
-        sceneNumVo.setSceneNum(sceneNum + plusCount);
-        sceneNumVo.setTotalNum(sceneNumVo.getSceneNum() + sceneNumVo.getCooperationSceneNum());
-        return sceneNumVo;
-    }
 
 
     @Override

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

@@ -112,13 +112,13 @@
 
     <select id="getGroupBySceneSouceV4" resultType="com.fdkankan.ucenter.vo.response.SceneNumVo">
         SELECT scene_source as type,count(1) as sceneNum,e.is_obj from t_scene_plus s LEFT JOIN t_scene_plus_ext e on s.id = e.plus_id
-        WHERE s.rec_status = 'A' and s.user_id = #{userId}
+        WHERE s.rec_status = 'A' and s.user_id = #{userId} and s.demo =0
         GROUP BY scene_source,is_obj
     </select>
 
     <select id="getCountByUserIdAndSceneSource" resultType="com.fdkankan.ucenter.entity.ScenePlus">
         select s.* from t_scene_plus s LEFT JOIN t_scene_plus_ext e on s.id = e.plus_id
-        WHERE s.rec_status = 'A' and s.user_id = #{userId}
+        WHERE s.rec_status = 'A' and s.user_id = #{userId} and s.demo =0
         <if test="sceneSourceList !=null and sceneSourceList.size >0">
             and s.scene_source in
             <foreach collection="sceneSourceList" item="sceneSource" open="(" separator="," close=")">
@@ -134,7 +134,7 @@
     <select id="getCountByAndIsObj" resultType="java.lang.Long">
         SELECT
         (select count(s.id) from t_scene_plus s LEFT JOIN t_scene_plus_ext e on s.id = e.plus_id
-        WHERE s.rec_status = 'A' and s.user_id = #{userId}
+        WHERE s.rec_status = 'A' and s.user_id = #{userId} and s.demo =0
         <if test="sceneSourceList !=null and sceneSourceList.size >0">
             and s.scene_source in
             <foreach collection="sceneSourceList" item="sceneSource" open="(" separator="," close=")">