Build 20240805：合并原版本的前台和登录功能，增加了权限控制，把用户的登录判断进行实装，如果用户不登陆，某些菜单不可用。

build/build.20240805/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+

build/build.20240805/WEB-INF/classes/app.properties

@@ -0,0 +1,5 @@
+AppDebug=true
+AppParamHelper=cn.tsy.idsse.dsds.helper.DSDSParamHelper
+AppDatabaseStdout=InActive
+AppListener=cn.tsy.idsse.dsds.control.DSDSInitializeLisener
+AppName=DSDS2024Server

build/build.20240805/WEB-INF/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictDataMapper.xml

@@ -0,0 +1,23 @@
+<?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.DictDataMapper">
+ 
+  <!-- 分页查询 -->
+  <select id="dataWithPage" resultType="map">
+	select * from dict_data where 1=1  	
+	<if test="query != null and query != ''">
+      and (data_name like concat('%',#{query},'%')  or data_remark like concat('%',#{query},'%') or data_alias 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/build.20240805/WEB-INF/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictEquipmentMapper.xml

@@ -0,0 +1,23 @@
+<?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.DictEquipmentMapper">
+ 
+  <!-- 分页查询 -->
+  <select id="equipmentWithPage" resultType="map">
+	select * from dict_equipment where 1=1 
+	<if test="query != null and query != ''">
+      and (equipment_name like concat('%',#{query},'%')  or equipment_remark like concat('%',#{query},'%') or equipment_alias 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/build.20240805/WEB-INF/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictPlatformMapper.xml

@@ -0,0 +1,24 @@
+<?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.DictPlatformMapper">
+ 
+  <!-- 分页查询 -->
+  <select id="platformWithPage" resultType="map">
+	select * from dict_platform where 1=1 
+	<if test="query != null and query != ''">
+      and (platform_name like concat('%',#{query},'%')  or platform_remark like concat('%',#{query},'%') or platform_alias 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/build.20240805/WEB-INF/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictUnitSailMapper.xml

@@ -0,0 +1,23 @@
+<?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/build.20240805/WEB-INF/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictUnitShareMapper.xml

@@ -0,0 +1,23 @@
+<?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/build.20240805/WEB-INF/classes/cn/tsy/data/idsse/dsds/mapper/sample/SampleDatasetMapper.xml

@@ -0,0 +1,28 @@
+<?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/build.20240805/WEB-INF/classes/cn/tsy/data/idsse/dsds/mapper/sample/SampleDatasetTrackMapper.xml

@@ -0,0 +1,42 @@
+<?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/build.20240805/WEB-INF/classes/cn/tsy/data/idsse/dsds/mapper/sample/SampleLineTrackMapper.xml

@@ -0,0 +1,13 @@
+<?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/build.20240805/WEB-INF/classes/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.xml

@@ -0,0 +1,22 @@
+<?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.SampleRegMapper">
+ 
+  <!-- 分页查询 -->
+  <select id="sampleWithPage" resultType="map">
+	select * from sample_reg  	where 1=1  	
+	<if test="query != null and query != ''">
+      and (sample_name like concat('%',#{query},'%')  or voyage_name like concat('%',#{query},'%') 
+        or platform_name like concat('%',#{query},'%') or sample_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/build.20240805/WEB-INF/classes/cn/tsy/data/idsse/dsds/mapper/sar/SarRegMapper.xml

@@ -0,0 +1,22 @@
+<?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/build.20240805/WEB-INF/classes/cn/tsy/data/idsse/dsds/mapper/voyage/VoyageMemberMapper.xml

@@ -0,0 +1,21 @@
+<?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/build.20240805/WEB-INF/classes/cn/tsy/data/idsse/dsds/mapper/voyage/VoyageNavigationMapper.xml

@@ -0,0 +1,26 @@
+<?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/build.20240805/WEB-INF/classes/cn/tsy/data/idsse/dsds/mapper/voyage/VoyageRegMapper.xml

@@ -0,0 +1,26 @@
+<?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.VoyageRegMapper">
+ 
+  <!-- 分页查询 -->
+  <select id="voyageWithPage" resultType="map">
+	select r.*,member_total from voyage_reg r
+	left join (select voyage_id,count(1) member_total from voyage_member group by voyage_id) m 
+	on r.tsy_id = m.voyage_id 
+	where 1=1  
+	<if test="query != null and query != ''">
+      and (voyage_name like concat('%',#{query},'%')  or voyage_officer like concat('%',#{query},'%')  
+       or voyage_officer like concat('%',#{query},'%') or voyage_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>