lyhzzz 1 周之前
父节点
当前提交
baf2ff75c5

+ 0 - 1
src/main/java/com/fdkankan/fusion/mapper/IScenePlusMapper.java

@@ -26,5 +26,4 @@ public interface IScenePlusMapper extends BaseMapper<ScenePlus> {
 
     List<DataGroupVo> groupByType(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("cameraIds") List<Long> cameraIds);
 
-    Page<ScenePlus> scenePostPage(Page<Object> objectPage, CaseParam param);
 }

+ 4 - 1
src/main/java/com/fdkankan/fusion/service/impl/ScenePlusServiceImpl.java

@@ -59,7 +59,10 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
     @Override
     public Page<ScenePlus> pageList(CaseParam param) {
-        Page<ScenePlus> page =   this.getBaseMapper().scenePostPage(new Page<>(param.getPageNum(), param.getPageSize()),param);
+        LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ScenePlus::getSceneStatus,1);
+        wrapper.orderByDesc(ScenePlus::getId);
+        Page<ScenePlus> page =  this.page(new Page<>(param.getPageNum(), param.getPageSize()),wrapper);
         List<String> collect = page.getRecords().stream().map(ScenePlus::getNum).collect(Collectors.toList());
         HashMap<String, String> mappingMap = sceneService.getMappingMap(collect);
         for (ScenePlus record : page.getRecords()) {

+ 0 - 23
src/main/resources/mapper/fusion/ScenePlusMapper.xml

@@ -34,27 +34,4 @@
         group by scene_source
     </select>
 
-    <select id="scenePostPage" resultType="com.fdkankan.fusion.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.scene_source not in (4,5,7,57) or ( s.scene_source in (4,5,7,57) and e.is_obj =1))
-        <if test="param.numList != null and param.numList.size >0">
-            and s.num in
-            <foreach item="num" collection="param.numList" open="(" separator="," close=")">
-                #{num}
-            </foreach>
-        </if>
-        <if test="param.num !=null and param.num !=''">
-            and s.num = #{param.num}
-        </if>
-        <if test="param.sceneName !=null and param.sceneName !=''">
-            and s.title like  concat ('%',#{param.sceneName},'%')
-        </if>
-        <if test="param.userId !=null">
-            and s.user_id = #{param.userId}
-        </if>
-        <if test="param.sceneStatus !=null">
-            and s.scene_status = #{param.sceneStatus}
-        </if>
-        order by s.id desc
-    </select>
 </mapper>