From e80e2d475c294d5b0f9c0ad06a0b06af92eefe59 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 18 Jul 2023 14:25:43 +0800
Subject: [PATCH] 时间降序排序
---
/dev/null | 42 ------------------------------------------
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java | 8 ++++++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml | 7 +++++--
3 files changed, 11 insertions(+), 46 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java
index 7c28e08..f0f4147 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/service/impl/PushServiceImpl.java
+++ b/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);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/utils/PushUtil.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/utils/PushUtil.java
deleted file mode 100644
index e161942..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/utils/PushUtil.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package cn.gistack.alerts.push.utils;
-
-import cn.gistack.alerts.push.vo.PushVO;
-import org.springframework.web.client.RestTemplate;
-
-import java.io.IOException;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-public class PushUtil {
-
- private String UNI_CLOUD_PUSH_URL = "https://fc-mp-ad1ed7e3-700e-4fca-abae-0d097cc222b5.next.bspapp.com/push";
-
- public static void main(String[] args) throws IOException {
-
-
- }
-
- /**
- * 消息推送
- * @param pushVO
- */
- public void pushMessage(PushVO pushVO){
- RestTemplate template = new RestTemplate();
- Map<String, Object> params = new LinkedHashMap<>();
-
- params.put("push_clientid",pushVO.getCIds());
- params.put("title",pushVO.getTitle());
- params.put("content",pushVO.getContent());
-
- String result = template.postForObject(UNI_CLOUD_PUSH_URL, params, String.class);
- }
-
- /**
- * 根据电话获取cIds
- * @param phoneIds
- */
- public void getCIdsByPhone(List<String> phoneIds){
-
- }
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
index 3c7bda6..3ed7db6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
+++ b/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
--
Gitblit v1.9.3