修改雷达移动入侵报警按create_time逆序返回数据 修改电子围栏获取不按用户部门获取按用户关联获取

‘liusuyi’

2023-09-13 72a254f120ae42780b77f873e4c4f3bf37345904

修改雷达移动入侵报警按create_time逆序返回数据
修改电子围栏获取不按用户部门获取按用户关联获取

 ard-work/src/main/java/com/ruoyi/alarmpoints/wall/mapper/ArdWallMapper.java

@@ -84,4 +84,12 @@
     * @return 结果
     */
    public int deleteArdWallUserByWallIds(String[] ids);

    /**
     * 查询电子围栏管理列表按关联用户id
     *
     * @param userId 关联用户id
     * @return 电子围栏管理集合
     */
    public List<ArdWall> selectArdWallListByUserId(String userId);
}

 ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java

@@ -238,12 +238,8 @@
        List<ArdAlarmWall> ardAlarmWalls = new ArrayList<>();
        //获取当前用户的部门
        String userId = ardAppPosition.getUserId();
        SysUser sysUser = redisCache.getCacheObject("user_list:" + userId);
        Long deptId = sysUser.getDeptId();
        //获取当前部门及子部门下的所有电子围栏
        ArdWall ardWall = new ArdWall();
        ardWall.setDeptId(deptId);
        List<ArdWall> ardWalls = ardWallMapper.selectArdWallList(ardWall);
        //获取用户关联的所有电子围栏
        List<ArdWall> ardWalls = ardWallMapper.selectArdWallListByUserId(userId);
        if (ardWalls.size() > 0) {
            //遍历所有电子围栏
            for (ArdWall wall : ardWalls) {

 ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml

@@ -152,6 +152,7 @@
             GROUP BY aar.NAME
            ) r
                INNER JOIN ard_alarm_radar_move aaar ON r.create_time1 = aaar.create_time
        ORDER BY aaar.create_time desc
    </select>
    <update id="updateViewTimeByCondition" parameterType="String">
        update ard_alarm_radar_move

 ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml

@@ -128,4 +128,13 @@
            #{wallId}
        </foreach>
    </delete>
    <select id="selectArdWallListByUserId" parameterType="String"  resultMap="ArdWallResult">
        SELECT
            aw.*
        FROM
            ard_wall aw
                LEFT JOIN ard_wall_user awu ON awu.wall_id = aw.ID
        WHERE
            awu.user_id =  #{userId}
    </select>
</mapper>

 ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml

@@ -123,6 +123,7 @@
            </if>
            <if test="userId != null  and userId != ''">and c.user_id = #{userId}</if>
        </where>
        order by c.create_time desc
    </select>

    <select id="selectArdAppTaskListWithDetail" parameterType="ArdAppTask" resultMap="ArdAppTaskSubResult">