update search

.gitignore

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
@@ -45,3 +46,18 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+=======
+# This file tells git to ignore certain files and directories when committing changes.
+lib/
+build/
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+
+*.class
+>>>>>>> 981724c32c499fc85fb8bb4b3be0c7809a2325ae

build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictUnitSailMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-  "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.tsy.data.idsse.dsds.mapper.dict.DictUnitSailMapper">
- 
-  <!-- 分页查询 -->
-  <select id="sailWithPage" resultType="map">
-	select * from dict_unit_sail where 1=1  
-	<if test="query != null and query != ''">
-      and (unit_name like concat('%',#{query},'%')  or link_man like concat('%',#{query},'%')) 
-    </if>
-    <if test="order != null and order != ''">
-		ORDER BY ${order} 
-	</if>
-	<if test="type != null and (type == 'DESC')">
-	 	DESC
-	</if>	
-  </select>
-  
-  
-  
-</mapper>

build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictUnitShareMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-  "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.tsy.data.idsse.dsds.mapper.dict.DictUnitShareMapper">
- 
-  <!-- 分页查询 -->
-  <select id="shareWithPage" resultType="map">
-	select * from dict_unit_share where 1=1  
-	<if test="query != null and query != ''">
-      and (unit_name like concat('%',#{query},'%')  or link_man like concat('%',#{query},'%')) 
-    </if>
-    <if test="order != null and order != ''">
-		ORDER BY ${order} 
-	</if>
-	<if test="type != null and (type == 'DESC')">
-	 	DESC
-	</if>		
-  </select>
-  
-  
-  
-</mapper>

build/classes/cn/tsy/data/idsse/dsds/mapper/sample/SampleDatasetMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"  "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.tsy.data.idsse.dsds.mapper.sample.SampleDatasetMapper">
- 
-  <!-- 分页查询 -->
-  <select id="datasetWithPage" resultType="map">
-	select file_total,d.* from sample_dataset d 
-	left join (
-	select dataset_id,count(1) file_total from sample_line group by dataset_id 
-	union select dataset_id,count(1) file_total from sample_station group by dataset_id 
-	) l
-	on d.tsy_id=l.dataset_id where 1=1 
-	<if test="query != null and query != ''">
-      and (dataset_name like concat('%',#{query},'%')  or voyage_name like concat('%',#{query},'%') 
-      	or platform_type like  concat('%',#{query},'%') or equipment_type like  concat('%',#{query},'%')
-        or platform_name like concat('%',#{query},'%') or dataset_remark like concat('%',#{query},'%')) 
-    </if>
-    <if test="order != null and order != ''">
-		ORDER BY ${order} 
-	</if>
-	<if test="type != null and (type == 'DESC')">
-	 	DESC
-	</if>
-  </select>
-  
-  
-  
-</mapper>

build/classes/cn/tsy/data/idsse/dsds/mapper/sample/SampleDatasetTrackMapper.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"  "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper
-	namespace="cn.tsy.data.idsse.dsds.mapper.sample.SampleDatasetTrackMapper">
-
-
-
-	<select id="totalTrack" resultType="map">
-		select max(track_time) max_time,min(track_time) min_time,max(track_lon)
-		max_lon,min(track_lon) min_lin,max(track_lat) max_lat,min(track_lat)
-		min_lat from sample_dataset_track where dataset_id=#{dataset_id};
-	</select>
-
-	<select id="listTrack" resultType="map">
-		SELECT
-		t1.*
-		FROM
-		sample_dataset_track t1,(
-		SELECT
-		min( tsy_id ) tsy_id
-		FROM
-		(
-		SELECT
-		track_time,
-		DATE_FORMAT( track_time, '%Y-%m-%d %H:%i' ) track_minute,
-		tsy_id
-		FROM
-		sample_dataset_track k
-		WHERE
-		dataset_id = #{dataset_id}
-		AND MOD ( MINUTE ( track_time ), ${ticket_minutes} )= 0
-		) s
-		GROUP BY
-		track_minute
-		) t2
-		WHERE
-		t1.tsy_id = t2.tsy_id
-		AND t1.dataset_id = #{dataset_id}
-		ORDER BY
-		t1.track_time
-	</select>
-</mapper>

build/classes/cn/tsy/data/idsse/dsds/mapper/sample/SampleLineTrackMapper.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"  "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.tsy.data.idsse.dsds.mapper.sample.SampleLineTrackMapper">
- 
-
-  
-  <select id="totalTrack" resultType="map">
-  	select max(track_time) max_time,min(track_time) min_time,max(track_lon) max_lon,min(track_lon) min_lin,max(track_lat) max_lat,
-  	min(track_lat) min_lat from sample_line_track where line_id=#{line_id};
-  </select>
-  
-  
-</mapper>

build/classes/cn/tsy/data/idsse/dsds/mapper/sar/SarRegMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"  "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.tsy.data.idsse.dsds.mapper.sar.SarRegMapper">
- 
-  <!-- 分页查询 -->
-  <select id="sarWithPage" resultType="map">
-	select * from sar_reg  	where 1=1  	
-	<if test="query != null and query != ''">
-      and (sar_name like concat('%',#{query},'%')  or link_man like concat('%',#{query},'%') 
-        or target_unit like concat('%',#{query},'%') or sar_remark like concat('%',#{query},'%')) 
-    </if>
-    <if test="order != null and order != ''">
-		ORDER BY ${order} 
-	</if>
-	<if test="type != null and (type == 'DESC')">
-	 	DESC
-	</if>
-  </select>
-  
-  
-  
-</mapper>

build/classes/cn/tsy/data/idsse/dsds/mapper/voyage/VoyageMemberMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"  "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.tsy.data.idsse.dsds.mapper.voyage.VoyageMemberMapper">
- 
-  <!-- 分页查询 -->
-  <select id="memberWithPage" resultType="map">
-	select * from voyage_member where 1=1  	
-	<if test="voyage_id != null">
-      and voyage_id = #{voyage_id} 
-    </if>
-    <if test="order != null and order != ''">
-		ORDER BY ${order} 
-	</if>
-	<if test="type != null and (type == 'DESC')">
-	 	DESC
-	</if>
-  </select>
-  
-  
-  
-</mapper>

build/classes/cn/tsy/data/idsse/dsds/mapper/voyage/VoyageNavigationMapper.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"  "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.tsy.data.idsse.dsds.mapper.voyage.VoyageNavigationMapper">
- 
-  <!-- 分页查询 -->
-  <select id="navigationWithPage" resultType="map">
-	select * from voyage_navigation where 1=1  	
-	<if test="voyage_id != null">
-      and voyage_id = #{voyage_id} 
-    </if>
-    <if test="order != null and order != ''">
-		ORDER BY ${order} 
-	</if>
-	<if test="type != null and (type == 'DESC')">
-	 	DESC
-	</if>
-  </select>
-  
-  <select id="totalNavigation" resultType="map">
-  	select max(nav_time) max_time,min(nav_time) min_time,max(nav_lon) max_lon,min(nav_lon) min_lin,max(nav_lat) max_lat,min(nav_lat) min_lat from voyage_navigation where voyage_id=#{voyage_id};
-  </select>
-  
-    <select id="listNavigation" resultType="map">
-  	select * from voyage_navigation where VOYAGE_ID=#{voyage_id} and MOD(MINUTE(NAV_TIME),${ticket_minutes})=0 order by nav_time
-  	 </select>
-</mapper>

build/classes/jdbc.properties

@@ -1,13 +0,0 @@
-JdbcDriverClass=com.mysql.cj.jdbc.Driver
-JdbcUrl=jdbc:mysql://127.0.0.1:3306/dsds2024?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true 
-JdbcUser=root
-JdbcPassword=localhost
-JdbcCheckouttimeout=30000
-JdbcMaxpoolsize=200
-JdbcAcquireertydelay=30000
-
-#JdbcDriverClass=com.mysql.jdbc.Driver
-#JdbcUrl=jdbc:mysql://192.168.6.78:3306/dsds_pdc?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-#JdbcUser=idsse
-#JdbcPassword=Ds56cD09Kj024
-#JdbcCheckouttimeout=5000