时间降序排序

guoshilong

2023-07-18 e80e2d475c294d5b0f9c0ad06a0b06af92eefe59

时间降序排序

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java

@@ -34,12 +34,11 @@

        RestTemplate template = new RestTemplate();
        Map<String, Object> params = new LinkedHashMap<>();
        Object o = bladeRedis.get(PUSH_CLIENT_ID + pushVO.getUserId());

        params.put("push_clientid",pushVO.getCIds());
        params.put("title",pushVO.getTitle());
        params.put("content",pushVO.getContent());
        UniCloudReturnRes uniCloudReturnRes = template.postForObject(UNI_CLOUD_PUSH_URL, params, UniCloudReturnRes.class);
        UniCloudReturnRes uniCloudReturnRes = template.getForObject(UNI_CLOUD_PUSH_URL,UniCloudReturnRes.class,params);
        return uniCloudReturnRes;
    }

@@ -85,6 +84,11 @@
        return true;
    }

    /**
     * 根据用户id从redis中获取cid
     * @param userId
     * @return
     */
    public String getClientIdByUserId(String userId){
        return bladeRedis.get(PUSH_CLIENT_ID+userId);
    }

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/utils/PushUtil.java

File was deleted

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml

@@ -35,13 +35,15 @@

    <select id="selectPatrolRecord" resultMap="selectPatrolRecordList">
        SELECT
        record.id,record.patrol_type,record.device_ids,record.images,record.videos,record.content,record.status,record.item_id,record.task_id,record.patrol_route,record.update_time,record.solution,
        record.id,record.patrol_type,record.device_ids,record.images,record.videos,record.content,record.status,record.item_id,record.task_id,record.patrol_route,record.create_time,record.update_time,record.solution,
        task.route_coordinates taskRoute,task.title taskName,
        item.items_name itemsName,item.description
        item.items_name itemsName,item.description,
        u.real_name
        FROM SM_PATROL_RECORD record
        LEFT JOIN sm_patrol_type type ON type.id = record.patrol_type
        LEFT JOIN sm_patrol_task task ON task.id = record.task_id
        LEFT JOIN sm_patrol_group_item item ON item.id = record.item_id
        LEFT JOIN BLADE_USER u ON u.id = record.create_user
        WHERE record.is_deleted = 0
        <if test="patrolRecord.status !=null and patrolRecord.status != '' ">
            AND record.status = #{patrolRecord.status}
@@ -52,6 +54,7 @@
        <if test="patrolRecord.taskId !=null and patrolRecord.taskId !=''">
            AND record.task_id = #{patrolRecord.taskId}
        </if>
        ORDER BY record.create_time DESC
    </select>
    <select id="getDetail" resultMap="selectPatrolRecordList">
        SELECT