From a022ae9804d0c2f402711b6b5202319d853919cf Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Fri, 09 Aug 2024 13:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-job/src/main/resources/mapper/ManageCoordinateDetailMapper.xml | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/screen-job/src/main/resources/mapper/ManageCoordinateDetailMapper.xml b/screen-job/src/main/resources/mapper/ManageCoordinateDetailMapper.xml
new file mode 100644
index 0000000..a605f40
--- /dev/null
+++ b/screen-job/src/main/resources/mapper/ManageCoordinateDetailMapper.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.moral.api.mapper.ManageCoordinateDetailMapper">
+
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.ManageCoordinateDetail">
+ <id column="id" property="id" />
+ <result column="coordinate_id" property="coordinateId" />
+ <result column="longitude" property="longitude" />
+ <result column="latitude" property="latitude" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_user_id" property="updateUserId" />
+ <result column="updaye_user_name" property="updayeUserName" />
+ </resultMap>
+
+
+ <select id="selectCoordinate" resultType="com.moral.api.entity.ManageCoordinate">
+ SELECT * FROM manage_coordinate WHERE is_del =0
+ </select>
+
+ <select id="getCruiserInfo" resultType="com.moral.api.entity.CruiserDTO">
+ select DATE_FORMAT(`time`, #{dateFormat}) AS time,value ->>'$.flylat' as flyLat,value ->>'$.flylon' as flyLon
+ from history_second_cruiser
+ WHERE
+ `time` <![CDATA[>=]]> #{startTime}
+ AND `time` <![CDATA[<=]]> #{endTime}
+ order by time
+ </select>
+
+ <select id="CompareTo" resultType="com.moral.api.entity.DustldDTO">
+ SELECT
+ mc.start_point as name ,
+ md.longitude as flyLon,
+ md.latitude as flyLat
+ FROM
+ manage_coordinate AS mc
+ LEFT JOIN manage_coordinate_detail AS md ON mc.coordinate_id = md.coordinate_id
+ WHERE
+ mc.is_del =0
+ and mc.organization_id=#{orgId}
+ </select>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0