diff --git a/.classpath b/.classpath index 823a146..70d9822 100644 --- a/.classpath +++ b/.classpath @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/.project b/.project index 886e0f9..e93a1ef 100644 --- a/.project +++ b/.project @@ -1,31 +1,31 @@ - - - DSDSServer - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - + + + DSDSServer + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.jdt.core.javanature + org.eclipse.wst.jsdt.core.jsNature + + diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope index 81672d4..e34514d 100644 --- a/.settings/.jsdtscope +++ b/.settings/.jsdtscope @@ -1,12 +1,12 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index bd4c009..23dbee5 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,15 +1,15 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index b0a5068..d339a31 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 3f9122b..54eb302 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,10 +1,10 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/build/classes/app.properties b/build/classes/app.properties index 9971273..1ad8ea2 100644 --- a/build/classes/app.properties +++ b/build/classes/app.properties @@ -1,5 +1,5 @@ -AppDebug=true -AppTrace=true -AppParamHelper=cn.tsy.cas.idsse.dsds.helper.DsdsParamHelper -AppListener=cn.tsy.cas.idsse.dsds.control.DSDSInitializeListener +AppDebug=true +AppTrace=true +AppParamHelper=cn.tsy.cas.idsse.dsds.helper.DSDSParamHelper +AppListener=cn.tsy.cas.idsse.dsds.control.DSDSInitializeListener AppName=DSDSServer \ No newline at end of file diff --git a/build/classes/cn/tsy/cas/idsse/dsds/control/sample/SampleDivingControl.class b/build/classes/cn/tsy/cas/idsse/dsds/control/sample/SampleDivingControl.class index 6aeb04d..dc108d2 100644 Binary files a/build/classes/cn/tsy/cas/idsse/dsds/control/sample/SampleDivingControl.class and b/build/classes/cn/tsy/cas/idsse/dsds/control/sample/SampleDivingControl.class differ diff --git a/build/classes/cn/tsy/cas/idsse/dsds/control/sample/SampleLineTrackControl.class b/build/classes/cn/tsy/cas/idsse/dsds/control/sample/SampleLineTrackControl.class index 5568c95..446a49d 100644 Binary files a/build/classes/cn/tsy/cas/idsse/dsds/control/sample/SampleLineTrackControl.class and b/build/classes/cn/tsy/cas/idsse/dsds/control/sample/SampleLineTrackControl.class differ diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictDataMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictDataMapper.xml index b8d4c02..a4ea204 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictDataMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictDataMapper.xml @@ -1,59 +1,59 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictEquipmentMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictEquipmentMapper.xml index 6bc4c02..bd977b2 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictEquipmentMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictEquipmentMapper.xml @@ -1,61 +1,61 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictFundingMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictFundingMapper.xml index 60bdcb4..42965d8 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictFundingMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictFundingMapper.xml @@ -1,22 +1,22 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictGeomMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictGeomMapper.xml index 8a0efdf..c0834bc 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictGeomMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictGeomMapper.xml @@ -1,57 +1,57 @@ - - - - - - - delete from dict_geom where geom_sn=#{voyage_name}; - INSERT INTO dict_geom ( geom_type, geom_sn, geom_value, create_time ) - SELECT - 'voyage', - voyage_name, - concat ( 'ST_GeomFromText(''LINESTRING(',string_agg ( concat ( nav_lon, '', nav_lat ), ',' ), ')''' ), - now( ) - FROM - voyage_navigation v, - voyage_reg r - WHERE - v.voyage_id = r.tsy_id - where - r.voyage_name=#{voyage_name} - GROUP BY - v.voyage_id, - voyage_name - ORDER BY - v.voyage_id; - - - - - delete from dict_geom where geom_sn=#{diving_sn}; - INSERT INTO dict_geom ( geom_type, geom_sn, geom_value, create_time ) - SELECT - 'diving', - diving_sn, - concat ( 'ST_GeomFromText(''LINESTRING(', string_agg( concat ( track_lon, '', track_lat ), ',' ), ')''' ), - now( ) - FROM - sample_dataset_track v, - sample_dataset r - WHERE - v.dataset_id = r.tsy_id - where r.diving_sn=#{diving_sn} - GROUP BY - r.diving_sn - ORDER BY - r.diving_sn; - - - - - - - + + + + + + + delete from dict_geom where geom_sn=#{voyage_name}; + INSERT INTO dict_geom ( geom_type, geom_sn, geom_value, create_time ) + SELECT + 'voyage', + voyage_name, + concat ( 'ST_GeomFromText(''LINESTRING(',string_agg ( concat ( nav_lon, '', nav_lat ), ',' ), ')''' ), + now( ) + FROM + voyage_navigation v, + voyage_reg r + WHERE + v.voyage_id = r.tsy_id + where + r.voyage_name=#{voyage_name} + GROUP BY + v.voyage_id, + voyage_name + ORDER BY + v.voyage_id; + + + + + delete from dict_geom where geom_sn=#{diving_sn}; + INSERT INTO dict_geom ( geom_type, geom_sn, geom_value, create_time ) + SELECT + 'diving', + diving_sn, + concat ( 'ST_GeomFromText(''LINESTRING(', string_agg( concat ( track_lon, '', track_lat ), ',' ), ')''' ), + now( ) + FROM + sample_dataset_track v, + sample_dataset r + WHERE + v.dataset_id = r.tsy_id + where r.diving_sn=#{diving_sn} + GROUP BY + r.diving_sn + ORDER BY + r.diving_sn; + + + + + + + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictPlatformMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictPlatformMapper.xml index a0f3aa8..86b28bd 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictPlatformMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictPlatformMapper.xml @@ -1,59 +1,59 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitSailMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitSailMapper.xml index c6551b5..d84a6f1 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitSailMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitSailMapper.xml @@ -1,23 +1,23 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitShareMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitShareMapper.xml index a454f65..61d49bd 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitShareMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitShareMapper.xml @@ -1,23 +1,23 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetMapper.xml index 6420cca..b13d43f 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetMapper.xml @@ -1,28 +1,28 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetTrackMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetTrackMapper.xml index b49f193..c73a8c3 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetTrackMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetTrackMapper.xml @@ -1,42 +1,42 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineTrackMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineTrackMapper.xml index 2fd6817..501abd4 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineTrackMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineTrackMapper.xml @@ -1,13 +1,13 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageMemberMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageMemberMapper.xml index a11e6e0..abc6001 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageMemberMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageMemberMapper.xml @@ -1,21 +1,21 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageNavigationMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageNavigationMapper.xml index bf68e67..cdbe8f7 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageNavigationMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageNavigationMapper.xml @@ -1,26 +1,26 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegMapper.xml index 0c31c02..7787ed1 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegMapper.xml @@ -1,81 +1,81 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegOptrMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegOptrMapper.xml index 8892104..d0cae5f 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegOptrMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegOptrMapper.xml @@ -1,12 +1,12 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml index 4e23f76..aae5902 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml @@ -1,257 +1,257 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/classes/jdbc.properties b/build/classes/jdbc.properties index a7e02d7..70d8168 100644 --- a/build/classes/jdbc.properties +++ b/build/classes/jdbc.properties @@ -1,18 +1,18 @@ -#JdbcUrl=jdbc:mysql://116.211.2.76:65206/aigg2025?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true -#JdbcUser=root -#JdbcPassword=hm2022 - -JdbcUrl=jdbc:postgresql://1.95.42.191:5432/idsse_dsds -JdbcUser=postgres -JdbcPassword=a654321a - -#JdbcUrl=jdbc:mysql://1.95.42.191:3306/xacom_tk?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true -#JdbcUser=root -#JdbcPassword=a654321a -JdbcCheckouttimeout=30000 -JdbcMaxpoolsize=200 - -#test.JdbcDriverClass=org.sqlite.JDBC -#test.JdbcUrl=jdbc:sqlite://d:\\gopmas.db -#test.JdbcCheckouttimeout=30000 +#JdbcUrl=jdbc:mysql://116.211.2.76:65206/aigg2025?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true +#JdbcUser=root +#JdbcPassword=hm2022 + +JdbcUrl=jdbc:postgresql://1.95.42.191:5432/idsse_dsds +JdbcUser=postgres +JdbcPassword=a654321a + +#JdbcUrl=jdbc:mysql://1.95.42.191:3306/xacom_tk?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true +#JdbcUser=root +#JdbcPassword=a654321a +JdbcCheckouttimeout=30000 +JdbcMaxpoolsize=200 + +#test.JdbcDriverClass=org.sqlite.JDBC +#test.JdbcUrl=jdbc:sqlite://d:\\gopmas.db +#test.JdbcCheckouttimeout=30000 #test.JdbcMaxpoolsize=200 \ No newline at end of file diff --git a/src/main/data/database.sql b/src/main/data/database.sql index 16a80cd..ba60595 100644 --- a/src/main/data/database.sql +++ b/src/main/data/database.sql @@ -1,9 +1,9 @@ -/* -PostgreSQL Backup -Database: idsse_dsds/public -Backup Time: 2025-10-26 12:29:51 -*/ - +/* +PostgreSQL Backup +Database: idsse_dsds/public +Backup Time: 2025-10-26 12:29:51 +*/ + DROP SEQUENCE IF EXISTS "public"."VOYAGE_REG_OPTR_TSY_ID_seq"; DROP SEQUENCE IF EXISTS "public"."dict_data_tsy_id_seq"; DROP SEQUENCE IF EXISTS "public"."dict_equipment_tsy_id_seq"; @@ -56,944 +56,944 @@ DROP TABLE IF EXISTS "public"."voyage_member"; DROP TABLE IF EXISTS "public"."voyage_navigation"; DROP TABLE IF EXISTS "public"."voyage_reg"; DROP TABLE IF EXISTS "public"."voyage_reg_optr"; -CREATE SEQUENCE "VOYAGE_REG_OPTR_TSY_ID_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "VOYAGE_REG_OPTR_TSY_ID_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "dict_data_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "dict_data_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "dict_equipment_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "dict_equipment_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "dict_funding_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "dict_funding_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "dict_geom_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "dict_geom_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "dict_platform_copy1_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "dict_platform_copy1_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "dict_platform_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "dict_platform_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "dict_unit_sail_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "dict_unit_sail_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "dict_unit_share_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "dict_unit_share_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "hme_frame_dept_dept_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "hme_frame_dept_dept_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "hme_frame_optr_optr_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "hme_frame_optr_optr_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "hme_frame_role_role_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "hme_frame_role_role_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "sample_dataset_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "sample_dataset_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "sample_line_track_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "sample_line_track_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "sample_line_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "sample_line_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "sample_station_track_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "sample_station_track_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "sample_station_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "sample_station_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "voyage_log_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "voyage_log_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "voyage_member_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "voyage_member_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "voyage_navigation_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "voyage_navigation_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "voyage_reg_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "voyage_reg_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE TABLE "dict_data" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "data_name" varchar(256) COLLATE "pg_catalog"."default", - "data_group" varchar(255) COLLATE "pg_catalog"."default", - "data_eng" varchar(256) COLLATE "pg_catalog"."default", - "data_alias" varchar(256) COLLATE "pg_catalog"."default", - "data_remark" varchar(1024) COLLATE "pg_catalog"."default", - "create_time" timestamp(6), - "data_order" int4 -) -; -ALTER TABLE "dict_data" OWNER TO "postgres"; -COMMENT ON COLUMN "dict_data"."data_name" IS '数据样品类型名称'; -COMMENT ON COLUMN "dict_data"."data_group" IS '分组'; -COMMENT ON COLUMN "dict_data"."data_eng" IS '英文名称'; -COMMENT ON COLUMN "dict_data"."data_alias" IS '别名'; -COMMENT ON COLUMN "dict_data"."data_remark" IS '描述信息'; -COMMENT ON COLUMN "dict_data"."create_time" IS '创建时间'; -COMMENT ON COLUMN "dict_data"."data_order" IS '排序信息'; +CREATE TABLE "dict_data" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "data_name" varchar(256) COLLATE "pg_catalog"."default", + "data_group" varchar(255) COLLATE "pg_catalog"."default", + "data_eng" varchar(256) COLLATE "pg_catalog"."default", + "data_alias" varchar(256) COLLATE "pg_catalog"."default", + "data_remark" varchar(1024) COLLATE "pg_catalog"."default", + "create_time" timestamp(6), + "data_order" int4 +) +; +ALTER TABLE "dict_data" OWNER TO "postgres"; +COMMENT ON COLUMN "dict_data"."data_name" IS '数据样品类型名称'; +COMMENT ON COLUMN "dict_data"."data_group" IS '分组'; +COMMENT ON COLUMN "dict_data"."data_eng" IS '英文名称'; +COMMENT ON COLUMN "dict_data"."data_alias" IS '别名'; +COMMENT ON COLUMN "dict_data"."data_remark" IS '描述信息'; +COMMENT ON COLUMN "dict_data"."create_time" IS '创建时间'; +COMMENT ON COLUMN "dict_data"."data_order" IS '排序信息'; COMMENT ON TABLE "dict_data" IS '字典-数据样品类型'; -CREATE TABLE "dict_equipment" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "equipment_name" varchar(256) COLLATE "pg_catalog"."default", - "equipment_group" varchar(64) COLLATE "pg_catalog"."default", - "equipment_eng" varchar(256) COLLATE "pg_catalog"."default", - "equipment_alias" varchar(256) COLLATE "pg_catalog"."default", - "equipment_remark" varchar(1024) COLLATE "pg_catalog"."default", - "create_time" timestamp(6), - "equipment_order" int4 -) -; -ALTER TABLE "dict_equipment" OWNER TO "postgres"; -COMMENT ON COLUMN "dict_equipment"."equipment_name" IS '设备类型名称'; -COMMENT ON COLUMN "dict_equipment"."equipment_group" IS '设备分组'; -COMMENT ON COLUMN "dict_equipment"."equipment_eng" IS '英文名称'; -COMMENT ON COLUMN "dict_equipment"."equipment_alias" IS '别名，简称'; -COMMENT ON COLUMN "dict_equipment"."equipment_remark" IS '备注信息'; -COMMENT ON COLUMN "dict_equipment"."create_time" IS '创建时间'; -COMMENT ON COLUMN "dict_equipment"."equipment_order" IS '排序信息'; +CREATE TABLE "dict_equipment" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "equipment_name" varchar(256) COLLATE "pg_catalog"."default", + "equipment_group" varchar(64) COLLATE "pg_catalog"."default", + "equipment_eng" varchar(256) COLLATE "pg_catalog"."default", + "equipment_alias" varchar(256) COLLATE "pg_catalog"."default", + "equipment_remark" varchar(1024) COLLATE "pg_catalog"."default", + "create_time" timestamp(6), + "equipment_order" int4 +) +; +ALTER TABLE "dict_equipment" OWNER TO "postgres"; +COMMENT ON COLUMN "dict_equipment"."equipment_name" IS '设备类型名称'; +COMMENT ON COLUMN "dict_equipment"."equipment_group" IS '设备分组'; +COMMENT ON COLUMN "dict_equipment"."equipment_eng" IS '英文名称'; +COMMENT ON COLUMN "dict_equipment"."equipment_alias" IS '别名，简称'; +COMMENT ON COLUMN "dict_equipment"."equipment_remark" IS '备注信息'; +COMMENT ON COLUMN "dict_equipment"."create_time" IS '创建时间'; +COMMENT ON COLUMN "dict_equipment"."equipment_order" IS '排序信息'; COMMENT ON TABLE "dict_equipment" IS '字典-设备类型'; -CREATE TABLE "dict_funding" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "funding_name" varchar(256) COLLATE "pg_catalog"."default", - "funding_eng" varchar(64) COLLATE "pg_catalog"."default", - "create_time" timestamp(6), - "funding_order" int4 -) -; -ALTER TABLE "dict_funding" OWNER TO "postgres"; -COMMENT ON COLUMN "dict_funding"."funding_name" IS '平台类型名称'; -COMMENT ON COLUMN "dict_funding"."funding_eng" IS '平台分组'; -COMMENT ON COLUMN "dict_funding"."create_time" IS '创建时间'; -COMMENT ON COLUMN "dict_funding"."funding_order" IS '排序信息'; +CREATE TABLE "dict_funding" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "funding_name" varchar(256) COLLATE "pg_catalog"."default", + "funding_eng" varchar(64) COLLATE "pg_catalog"."default", + "create_time" timestamp(6), + "funding_order" int4 +) +; +ALTER TABLE "dict_funding" OWNER TO "postgres"; +COMMENT ON COLUMN "dict_funding"."funding_name" IS '平台类型名称'; +COMMENT ON COLUMN "dict_funding"."funding_eng" IS '平台分组'; +COMMENT ON COLUMN "dict_funding"."create_time" IS '创建时间'; +COMMENT ON COLUMN "dict_funding"."funding_order" IS '排序信息'; COMMENT ON TABLE "dict_funding" IS '字典-资助机构'; -CREATE TABLE "dict_geom" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "geom_type" varchar(32) COLLATE "pg_catalog"."default", - "geom_name" varchar(512) COLLATE "pg_catalog"."default", - "geom_level" varchar(32) COLLATE "pg_catalog"."default", - "geom_sn" varchar(32) COLLATE "pg_catalog"."default", - "geom_value" text COLLATE "pg_catalog"."default", - "create_time" timestamp(6) -) -; -ALTER TABLE "dict_geom" OWNER TO "postgres"; -COMMENT ON COLUMN "dict_geom"."geom_type" IS '图层类型：voyage：航次；diving：潜次'; -COMMENT ON COLUMN "dict_geom"."geom_name" IS '图层名称，geoserver画好了回填'; -COMMENT ON COLUMN "dict_geom"."geom_level" IS '图层级别'; -COMMENT ON COLUMN "dict_geom"."geom_sn" IS '航次号或者潜次号'; -COMMENT ON COLUMN "dict_geom"."geom_value" IS 'ST_GeomFromText开头的字符串'; -COMMENT ON COLUMN "dict_geom"."create_time" IS '创建日期'; +CREATE TABLE "dict_geom" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "geom_type" varchar(32) COLLATE "pg_catalog"."default", + "geom_name" varchar(512) COLLATE "pg_catalog"."default", + "geom_level" varchar(32) COLLATE "pg_catalog"."default", + "geom_sn" varchar(32) COLLATE "pg_catalog"."default", + "geom_value" text COLLATE "pg_catalog"."default", + "create_time" timestamp(6) +) +; +ALTER TABLE "dict_geom" OWNER TO "postgres"; +COMMENT ON COLUMN "dict_geom"."geom_type" IS '图层类型：voyage：航次；diving：潜次'; +COMMENT ON COLUMN "dict_geom"."geom_name" IS '图层名称，geoserver画好了回填'; +COMMENT ON COLUMN "dict_geom"."geom_level" IS '图层级别'; +COMMENT ON COLUMN "dict_geom"."geom_sn" IS '航次号或者潜次号'; +COMMENT ON COLUMN "dict_geom"."geom_value" IS 'ST_GeomFromText开头的字符串'; +COMMENT ON COLUMN "dict_geom"."create_time" IS '创建日期'; COMMENT ON TABLE "dict_geom" IS '图层信息'; -CREATE TABLE "dict_platform" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "platform_name" varchar(256) COLLATE "pg_catalog"."default", - "platform_group" varchar(64) COLLATE "pg_catalog"."default", - "platform_eng" varchar(256) COLLATE "pg_catalog"."default", - "platform_alias" varchar(256) COLLATE "pg_catalog"."default", - "platform_remark" varchar(1024) COLLATE "pg_catalog"."default", - "create_time" timestamp(6), - "platform_order" int4 -) -; -ALTER TABLE "dict_platform" OWNER TO "postgres"; -COMMENT ON COLUMN "dict_platform"."platform_name" IS '平台类型名称'; -COMMENT ON COLUMN "dict_platform"."platform_group" IS '平台分组'; -COMMENT ON COLUMN "dict_platform"."platform_eng" IS '英文名称'; -COMMENT ON COLUMN "dict_platform"."platform_alias" IS '别名'; -COMMENT ON COLUMN "dict_platform"."platform_remark" IS '备注信息'; -COMMENT ON COLUMN "dict_platform"."create_time" IS '创建时间'; -COMMENT ON COLUMN "dict_platform"."platform_order" IS '排序信息'; +CREATE TABLE "dict_platform" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "platform_name" varchar(256) COLLATE "pg_catalog"."default", + "platform_group" varchar(64) COLLATE "pg_catalog"."default", + "platform_eng" varchar(256) COLLATE "pg_catalog"."default", + "platform_alias" varchar(256) COLLATE "pg_catalog"."default", + "platform_remark" varchar(1024) COLLATE "pg_catalog"."default", + "create_time" timestamp(6), + "platform_order" int4 +) +; +ALTER TABLE "dict_platform" OWNER TO "postgres"; +COMMENT ON COLUMN "dict_platform"."platform_name" IS '平台类型名称'; +COMMENT ON COLUMN "dict_platform"."platform_group" IS '平台分组'; +COMMENT ON COLUMN "dict_platform"."platform_eng" IS '英文名称'; +COMMENT ON COLUMN "dict_platform"."platform_alias" IS '别名'; +COMMENT ON COLUMN "dict_platform"."platform_remark" IS '备注信息'; +COMMENT ON COLUMN "dict_platform"."create_time" IS '创建时间'; +COMMENT ON COLUMN "dict_platform"."platform_order" IS '排序信息'; COMMENT ON TABLE "dict_platform" IS '字典-平台类型'; -CREATE TABLE "dict_report" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "report_type" varchar(256) COLLATE "pg_catalog"."default", - "report_name" varchar(64) COLLATE "pg_catalog"."default", - "report_status" varchar(256) COLLATE "pg_catalog"."default", - "report_order" varchar(256) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "dict_report" OWNER TO "postgres"; -COMMENT ON COLUMN "dict_report"."report_type" IS '报表类型'; -COMMENT ON COLUMN "dict_report"."report_name" IS '报名名称'; -COMMENT ON COLUMN "dict_report"."report_status" IS '状态，是否启用'; -COMMENT ON COLUMN "dict_report"."report_order" IS '顺序'; +CREATE TABLE "dict_report" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "report_type" varchar(256) COLLATE "pg_catalog"."default", + "report_name" varchar(64) COLLATE "pg_catalog"."default", + "report_status" varchar(256) COLLATE "pg_catalog"."default", + "report_order" varchar(256) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "dict_report" OWNER TO "postgres"; +COMMENT ON COLUMN "dict_report"."report_type" IS '报表类型'; +COMMENT ON COLUMN "dict_report"."report_name" IS '报名名称'; +COMMENT ON COLUMN "dict_report"."report_status" IS '状态，是否启用'; +COMMENT ON COLUMN "dict_report"."report_order" IS '顺序'; COMMENT ON TABLE "dict_report" IS '统计'; -CREATE TABLE "dict_unit_sail" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "unit_name" varchar(256) COLLATE "pg_catalog"."default", - "link_man" varchar(128) COLLATE "pg_catalog"."default", - "link_tel" varchar(128) COLLATE "pg_catalog"."default", - "link_fax" varchar(128) COLLATE "pg_catalog"."default", - "link_email" varchar(128) COLLATE "pg_catalog"."default", - "unit_lon" varchar(32) COLLATE "pg_catalog"."default", - "unit_lat" varchar(32) COLLATE "pg_catalog"."default", - "unit_addr" varchar(256) COLLATE "pg_catalog"."default", - "unit_type" varchar(64) COLLATE "pg_catalog"."default", - "unit_remark" varchar(1024) COLLATE "pg_catalog"."default", - "create_time" timestamp(6) -) -; -ALTER TABLE "dict_unit_sail" OWNER TO "postgres"; -COMMENT ON COLUMN "dict_unit_sail"."unit_name" IS '参航单位名称'; -COMMENT ON COLUMN "dict_unit_sail"."link_man" IS '单位负责人'; -COMMENT ON COLUMN "dict_unit_sail"."link_tel" IS '联系电话'; -COMMENT ON COLUMN "dict_unit_sail"."link_fax" IS '传真号码'; -COMMENT ON COLUMN "dict_unit_sail"."link_email" IS '电子邮件'; -COMMENT ON COLUMN "dict_unit_sail"."unit_lon" IS '经度信息'; -COMMENT ON COLUMN "dict_unit_sail"."unit_lat" IS '纬度信息'; -COMMENT ON COLUMN "dict_unit_sail"."unit_addr" IS '单位地址'; -COMMENT ON COLUMN "dict_unit_sail"."unit_type" IS '单位类型'; -COMMENT ON COLUMN "dict_unit_sail"."unit_remark" IS '备注信息'; -COMMENT ON COLUMN "dict_unit_sail"."create_time" IS '创建时间'; +CREATE TABLE "dict_unit_sail" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "unit_name" varchar(256) COLLATE "pg_catalog"."default", + "link_man" varchar(128) COLLATE "pg_catalog"."default", + "link_tel" varchar(128) COLLATE "pg_catalog"."default", + "link_fax" varchar(128) COLLATE "pg_catalog"."default", + "link_email" varchar(128) COLLATE "pg_catalog"."default", + "unit_lon" varchar(32) COLLATE "pg_catalog"."default", + "unit_lat" varchar(32) COLLATE "pg_catalog"."default", + "unit_addr" varchar(256) COLLATE "pg_catalog"."default", + "unit_type" varchar(64) COLLATE "pg_catalog"."default", + "unit_remark" varchar(1024) COLLATE "pg_catalog"."default", + "create_time" timestamp(6) +) +; +ALTER TABLE "dict_unit_sail" OWNER TO "postgres"; +COMMENT ON COLUMN "dict_unit_sail"."unit_name" IS '参航单位名称'; +COMMENT ON COLUMN "dict_unit_sail"."link_man" IS '单位负责人'; +COMMENT ON COLUMN "dict_unit_sail"."link_tel" IS '联系电话'; +COMMENT ON COLUMN "dict_unit_sail"."link_fax" IS '传真号码'; +COMMENT ON COLUMN "dict_unit_sail"."link_email" IS '电子邮件'; +COMMENT ON COLUMN "dict_unit_sail"."unit_lon" IS '经度信息'; +COMMENT ON COLUMN "dict_unit_sail"."unit_lat" IS '纬度信息'; +COMMENT ON COLUMN "dict_unit_sail"."unit_addr" IS '单位地址'; +COMMENT ON COLUMN "dict_unit_sail"."unit_type" IS '单位类型'; +COMMENT ON COLUMN "dict_unit_sail"."unit_remark" IS '备注信息'; +COMMENT ON COLUMN "dict_unit_sail"."create_time" IS '创建时间'; COMMENT ON TABLE "dict_unit_sail" IS '字典-参航单位'; -CREATE TABLE "dict_unit_share" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "unit_name" varchar(256) COLLATE "pg_catalog"."default", - "link_man" varchar(128) COLLATE "pg_catalog"."default", - "link_tel" varchar(128) COLLATE "pg_catalog"."default", - "link_fax" varchar(128) COLLATE "pg_catalog"."default", - "link_email" varchar(128) COLLATE "pg_catalog"."default", - "unit_addr" varchar(256) COLLATE "pg_catalog"."default", - "unit_type" varchar(64) COLLATE "pg_catalog"."default", - "unit_remark" varchar(1024) COLLATE "pg_catalog"."default", - "create_time" timestamp(6) -) -; -ALTER TABLE "dict_unit_share" OWNER TO "postgres"; -COMMENT ON COLUMN "dict_unit_share"."unit_name" IS '参航单位名称'; -COMMENT ON COLUMN "dict_unit_share"."link_man" IS '单位负责人'; -COMMENT ON COLUMN "dict_unit_share"."link_tel" IS '联系电话'; -COMMENT ON COLUMN "dict_unit_share"."link_fax" IS '传真号码'; -COMMENT ON COLUMN "dict_unit_share"."link_email" IS '电子邮件'; -COMMENT ON COLUMN "dict_unit_share"."unit_addr" IS '单位地址'; -COMMENT ON COLUMN "dict_unit_share"."unit_type" IS '单位类型'; -COMMENT ON COLUMN "dict_unit_share"."unit_remark" IS '备注信息'; -COMMENT ON COLUMN "dict_unit_share"."create_time" IS '创建时间'; +CREATE TABLE "dict_unit_share" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "unit_name" varchar(256) COLLATE "pg_catalog"."default", + "link_man" varchar(128) COLLATE "pg_catalog"."default", + "link_tel" varchar(128) COLLATE "pg_catalog"."default", + "link_fax" varchar(128) COLLATE "pg_catalog"."default", + "link_email" varchar(128) COLLATE "pg_catalog"."default", + "unit_addr" varchar(256) COLLATE "pg_catalog"."default", + "unit_type" varchar(64) COLLATE "pg_catalog"."default", + "unit_remark" varchar(1024) COLLATE "pg_catalog"."default", + "create_time" timestamp(6) +) +; +ALTER TABLE "dict_unit_share" OWNER TO "postgres"; +COMMENT ON COLUMN "dict_unit_share"."unit_name" IS '参航单位名称'; +COMMENT ON COLUMN "dict_unit_share"."link_man" IS '单位负责人'; +COMMENT ON COLUMN "dict_unit_share"."link_tel" IS '联系电话'; +COMMENT ON COLUMN "dict_unit_share"."link_fax" IS '传真号码'; +COMMENT ON COLUMN "dict_unit_share"."link_email" IS '电子邮件'; +COMMENT ON COLUMN "dict_unit_share"."unit_addr" IS '单位地址'; +COMMENT ON COLUMN "dict_unit_share"."unit_type" IS '单位类型'; +COMMENT ON COLUMN "dict_unit_share"."unit_remark" IS '备注信息'; +COMMENT ON COLUMN "dict_unit_share"."create_time" IS '创建时间'; COMMENT ON TABLE "dict_unit_share" IS '字典-共享单位'; -CREATE TABLE "hme_frame_dept" ( - "dept_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "dept_name" varchar(64) COLLATE "pg_catalog"."default", - "dept_desc" varchar(254) COLLATE "pg_catalog"."default", - "dept_pid" int4, - "dept_manager" varchar(254) COLLATE "pg_catalog"."default", - "dept_addr" varchar(255) COLLATE "pg_catalog"."default", - "dept_tel" varchar(64) COLLATE "pg_catalog"."default", - "dept_fax" varchar(64) COLLATE "pg_catalog"."default", - "dept_code" varchar(64) COLLATE "pg_catalog"."default", - "dept_level" int4, - "dept_param" varchar(256) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_dept" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_dept"."dept_id" IS '部门编号'; -COMMENT ON COLUMN "hme_frame_dept"."dept_name" IS '部门名称'; -COMMENT ON COLUMN "hme_frame_dept"."dept_desc" IS '备注信息'; -COMMENT ON COLUMN "hme_frame_dept"."dept_pid" IS '部门上级部门'; -COMMENT ON COLUMN "hme_frame_dept"."dept_manager" IS '部门经理'; -COMMENT ON COLUMN "hme_frame_dept"."dept_addr" IS '部门地址'; -COMMENT ON COLUMN "hme_frame_dept"."dept_tel" IS '部门联系电话'; -COMMENT ON COLUMN "hme_frame_dept"."dept_fax" IS '部门传真'; -COMMENT ON COLUMN "hme_frame_dept"."dept_code" IS '部门编号'; -COMMENT ON COLUMN "hme_frame_dept"."dept_level" IS '部门级别'; -COMMENT ON COLUMN "hme_frame_dept"."dept_param" IS '部门参数'; +CREATE TABLE "hme_frame_dept" ( + "dept_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "dept_name" varchar(64) COLLATE "pg_catalog"."default", + "dept_desc" varchar(254) COLLATE "pg_catalog"."default", + "dept_pid" int4, + "dept_manager" varchar(254) COLLATE "pg_catalog"."default", + "dept_addr" varchar(255) COLLATE "pg_catalog"."default", + "dept_tel" varchar(64) COLLATE "pg_catalog"."default", + "dept_fax" varchar(64) COLLATE "pg_catalog"."default", + "dept_code" varchar(64) COLLATE "pg_catalog"."default", + "dept_level" int4, + "dept_param" varchar(256) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_dept" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_dept"."dept_id" IS '部门编号'; +COMMENT ON COLUMN "hme_frame_dept"."dept_name" IS '部门名称'; +COMMENT ON COLUMN "hme_frame_dept"."dept_desc" IS '备注信息'; +COMMENT ON COLUMN "hme_frame_dept"."dept_pid" IS '部门上级部门'; +COMMENT ON COLUMN "hme_frame_dept"."dept_manager" IS '部门经理'; +COMMENT ON COLUMN "hme_frame_dept"."dept_addr" IS '部门地址'; +COMMENT ON COLUMN "hme_frame_dept"."dept_tel" IS '部门联系电话'; +COMMENT ON COLUMN "hme_frame_dept"."dept_fax" IS '部门传真'; +COMMENT ON COLUMN "hme_frame_dept"."dept_code" IS '部门编号'; +COMMENT ON COLUMN "hme_frame_dept"."dept_level" IS '部门级别'; +COMMENT ON COLUMN "hme_frame_dept"."dept_param" IS '部门参数'; COMMENT ON TABLE "hme_frame_dept" IS '系统表-部门信息'; -CREATE TABLE "hme_frame_dict" ( - "dict_name" varchar(32) COLLATE "pg_catalog"."default" NOT NULL, - "dict_value" varchar(128) COLLATE "pg_catalog"."default" NOT NULL, - "dict_text" varchar(128) COLLATE "pg_catalog"."default" NOT NULL, - "dict_order" int4 -) -; -ALTER TABLE "hme_frame_dict" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_dict"."dict_name" IS '字典名称'; -COMMENT ON COLUMN "hme_frame_dict"."dict_value" IS '字典值'; -COMMENT ON COLUMN "hme_frame_dict"."dict_text" IS '字典中文名称'; -COMMENT ON COLUMN "hme_frame_dict"."dict_order" IS '字典排序'; +CREATE TABLE "hme_frame_dict" ( + "dict_name" varchar(32) COLLATE "pg_catalog"."default" NOT NULL, + "dict_value" varchar(128) COLLATE "pg_catalog"."default" NOT NULL, + "dict_text" varchar(128) COLLATE "pg_catalog"."default" NOT NULL, + "dict_order" int4 +) +; +ALTER TABLE "hme_frame_dict" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_dict"."dict_name" IS '字典名称'; +COMMENT ON COLUMN "hme_frame_dict"."dict_value" IS '字典值'; +COMMENT ON COLUMN "hme_frame_dict"."dict_text" IS '字典中文名称'; +COMMENT ON COLUMN "hme_frame_dict"."dict_order" IS '字典排序'; COMMENT ON TABLE "hme_frame_dict" IS '系统表-字典定义'; -CREATE TABLE "hme_frame_dict_name" ( - "dict_name" varchar(32) COLLATE "pg_catalog"."default" NOT NULL, - "dict_group" varchar(32) COLLATE "pg_catalog"."default", - "dict_note" varchar(128) COLLATE "pg_catalog"."default", - "dict_modify" varchar(1) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_dict_name" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_dict_name"."dict_name" IS '字典类型'; -COMMENT ON COLUMN "hme_frame_dict_name"."dict_group" IS '字典分离'; -COMMENT ON COLUMN "hme_frame_dict_name"."dict_note" IS '字典描述信息'; -COMMENT ON COLUMN "hme_frame_dict_name"."dict_modify" IS '是否运行修改'; +CREATE TABLE "hme_frame_dict_name" ( + "dict_name" varchar(32) COLLATE "pg_catalog"."default" NOT NULL, + "dict_group" varchar(32) COLLATE "pg_catalog"."default", + "dict_note" varchar(128) COLLATE "pg_catalog"."default", + "dict_modify" varchar(1) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_dict_name" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_dict_name"."dict_name" IS '字典类型'; +COMMENT ON COLUMN "hme_frame_dict_name"."dict_group" IS '字典分离'; +COMMENT ON COLUMN "hme_frame_dict_name"."dict_note" IS '字典描述信息'; +COMMENT ON COLUMN "hme_frame_dict_name"."dict_modify" IS '是否运行修改'; COMMENT ON TABLE "hme_frame_dict_name" IS '系统表-字典类型定义'; -CREATE TABLE "hme_frame_language" ( - "lang_key" varchar(128) COLLATE "pg_catalog"."default" NOT NULL, - "lang_client" varchar(1) COLLATE "pg_catalog"."default", - "lang_name" varchar(32) COLLATE "pg_catalog"."default", - "lang_ch" varchar(1024) COLLATE "pg_catalog"."default", - "lang_en" varchar(1024) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_language" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_language"."lang_key" IS '配置名称'; -COMMENT ON COLUMN "hme_frame_language"."lang_client" IS '是否是前端，0不是，1，是'; -COMMENT ON COLUMN "hme_frame_language"."lang_name" IS '配置说明'; -COMMENT ON COLUMN "hme_frame_language"."lang_ch" IS '中文'; -COMMENT ON COLUMN "hme_frame_language"."lang_en" IS '英文'; +CREATE TABLE "hme_frame_language" ( + "lang_key" varchar(128) COLLATE "pg_catalog"."default" NOT NULL, + "lang_client" varchar(1) COLLATE "pg_catalog"."default", + "lang_name" varchar(32) COLLATE "pg_catalog"."default", + "lang_ch" varchar(1024) COLLATE "pg_catalog"."default", + "lang_en" varchar(1024) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_language" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_language"."lang_key" IS '配置名称'; +COMMENT ON COLUMN "hme_frame_language"."lang_client" IS '是否是前端，0不是，1，是'; +COMMENT ON COLUMN "hme_frame_language"."lang_name" IS '配置说明'; +COMMENT ON COLUMN "hme_frame_language"."lang_ch" IS '中文'; +COMMENT ON COLUMN "hme_frame_language"."lang_en" IS '英文'; COMMENT ON TABLE "hme_frame_language" IS '系统表-语言定义'; -CREATE TABLE "hme_frame_optr" ( - "optr_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "optr_name" varchar(64) COLLATE "pg_catalog"."default", - "login_name" varchar(64) COLLATE "pg_catalog"."default", - "login_pass" varchar(128) COLLATE "pg_catalog"."default", - "optr_alias" varchar(32) COLLATE "pg_catalog"."default", - "optr_sex" varchar(32) COLLATE "pg_catalog"."default", - "optr_status" varchar(32) COLLATE "pg_catalog"."default", - "optr_email" varchar(128) COLLATE "pg_catalog"."default", - "optr_mobile" varchar(32) COLLATE "pg_catalog"."default", - "optr_tel" varchar(32) COLLATE "pg_catalog"."default", - "optr_addr" varchar(256) COLLATE "pg_catalog"."default", - "optr_fax" varchar(32) COLLATE "pg_catalog"."default", - "optr_dept" int4, - "optr_post" varchar(16) COLLATE "pg_catalog"."default", - "optr_level" int4, - "optr_desc" varchar(256) COLLATE "pg_catalog"."default", - "optr_image" varchar(256) COLLATE "pg_catalog"."default", - "optr_param" varchar(256) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_optr" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_optr"."optr_id" IS '内部编号'; -COMMENT ON COLUMN "hme_frame_optr"."optr_name" IS '操作员名称'; -COMMENT ON COLUMN "hme_frame_optr"."login_name" IS '登录名称，唯一'; -COMMENT ON COLUMN "hme_frame_optr"."login_pass" IS '登录密码,MD5加密'; -COMMENT ON COLUMN "hme_frame_optr"."optr_alias" IS '别名'; -COMMENT ON COLUMN "hme_frame_optr"."optr_sex" IS '操作员性别，FrameSex'; -COMMENT ON COLUMN "hme_frame_optr"."optr_status" IS '操作员状态，对应FrameStatus'; -COMMENT ON COLUMN "hme_frame_optr"."optr_email" IS '电子邮件地址'; -COMMENT ON COLUMN "hme_frame_optr"."optr_mobile" IS '联系电话'; -COMMENT ON COLUMN "hme_frame_optr"."optr_tel" IS '办公电话'; -COMMENT ON COLUMN "hme_frame_optr"."optr_addr" IS '联系地址'; -COMMENT ON COLUMN "hme_frame_optr"."optr_fax" IS '传真号码'; -COMMENT ON COLUMN "hme_frame_optr"."optr_dept" IS '部门编号'; -COMMENT ON COLUMN "hme_frame_optr"."optr_post" IS '邮政编码'; -COMMENT ON COLUMN "hme_frame_optr"."optr_level" IS '操作员级别'; -COMMENT ON COLUMN "hme_frame_optr"."optr_desc" IS '操作员备注信息'; -COMMENT ON COLUMN "hme_frame_optr"."optr_image" IS '操作员照片（存放路径）'; -COMMENT ON COLUMN "hme_frame_optr"."optr_param" IS '参数信息'; +CREATE TABLE "hme_frame_optr" ( + "optr_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "optr_name" varchar(64) COLLATE "pg_catalog"."default", + "login_name" varchar(64) COLLATE "pg_catalog"."default", + "login_pass" varchar(128) COLLATE "pg_catalog"."default", + "optr_alias" varchar(32) COLLATE "pg_catalog"."default", + "optr_sex" varchar(32) COLLATE "pg_catalog"."default", + "optr_status" varchar(32) COLLATE "pg_catalog"."default", + "optr_email" varchar(128) COLLATE "pg_catalog"."default", + "optr_mobile" varchar(32) COLLATE "pg_catalog"."default", + "optr_tel" varchar(32) COLLATE "pg_catalog"."default", + "optr_addr" varchar(256) COLLATE "pg_catalog"."default", + "optr_fax" varchar(32) COLLATE "pg_catalog"."default", + "optr_dept" int4, + "optr_post" varchar(16) COLLATE "pg_catalog"."default", + "optr_level" int4, + "optr_desc" varchar(256) COLLATE "pg_catalog"."default", + "optr_image" varchar(256) COLLATE "pg_catalog"."default", + "optr_param" varchar(256) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_optr" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_optr"."optr_id" IS '内部编号'; +COMMENT ON COLUMN "hme_frame_optr"."optr_name" IS '操作员名称'; +COMMENT ON COLUMN "hme_frame_optr"."login_name" IS '登录名称，唯一'; +COMMENT ON COLUMN "hme_frame_optr"."login_pass" IS '登录密码,MD5加密'; +COMMENT ON COLUMN "hme_frame_optr"."optr_alias" IS '别名'; +COMMENT ON COLUMN "hme_frame_optr"."optr_sex" IS '操作员性别，FrameSex'; +COMMENT ON COLUMN "hme_frame_optr"."optr_status" IS '操作员状态，对应FrameStatus'; +COMMENT ON COLUMN "hme_frame_optr"."optr_email" IS '电子邮件地址'; +COMMENT ON COLUMN "hme_frame_optr"."optr_mobile" IS '联系电话'; +COMMENT ON COLUMN "hme_frame_optr"."optr_tel" IS '办公电话'; +COMMENT ON COLUMN "hme_frame_optr"."optr_addr" IS '联系地址'; +COMMENT ON COLUMN "hme_frame_optr"."optr_fax" IS '传真号码'; +COMMENT ON COLUMN "hme_frame_optr"."optr_dept" IS '部门编号'; +COMMENT ON COLUMN "hme_frame_optr"."optr_post" IS '邮政编码'; +COMMENT ON COLUMN "hme_frame_optr"."optr_level" IS '操作员级别'; +COMMENT ON COLUMN "hme_frame_optr"."optr_desc" IS '操作员备注信息'; +COMMENT ON COLUMN "hme_frame_optr"."optr_image" IS '操作员照片（存放路径）'; +COMMENT ON COLUMN "hme_frame_optr"."optr_param" IS '参数信息'; COMMENT ON TABLE "hme_frame_optr" IS '系统表-操作员信息'; -CREATE TABLE "hme_frame_optr_log" ( - "log_id" int4 NOT NULL, - "optr_id" int4, - "login_name" varchar(32) COLLATE "pg_catalog"."default", - "log_type" varchar(32) COLLATE "pg_catalog"."default", - "log_time" timestamp(6), - "log_param" text COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_optr_log" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_optr_log"."log_id" IS '内部编号'; -COMMENT ON COLUMN "hme_frame_optr_log"."optr_id" IS '操作员编号'; -COMMENT ON COLUMN "hme_frame_optr_log"."login_name" IS '操作员名称'; -COMMENT ON COLUMN "hme_frame_optr_log"."log_type" IS '日志类型'; -COMMENT ON COLUMN "hme_frame_optr_log"."log_time" IS '记录日志时间'; -COMMENT ON COLUMN "hme_frame_optr_log"."log_param" IS '日志参数'; +CREATE TABLE "hme_frame_optr_log" ( + "log_id" int4 NOT NULL, + "optr_id" int4, + "login_name" varchar(32) COLLATE "pg_catalog"."default", + "log_type" varchar(32) COLLATE "pg_catalog"."default", + "log_time" timestamp(6), + "log_param" text COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_optr_log" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_optr_log"."log_id" IS '内部编号'; +COMMENT ON COLUMN "hme_frame_optr_log"."optr_id" IS '操作员编号'; +COMMENT ON COLUMN "hme_frame_optr_log"."login_name" IS '操作员名称'; +COMMENT ON COLUMN "hme_frame_optr_log"."log_type" IS '日志类型'; +COMMENT ON COLUMN "hme_frame_optr_log"."log_time" IS '记录日志时间'; +COMMENT ON COLUMN "hme_frame_optr_log"."log_param" IS '日志参数'; COMMENT ON TABLE "hme_frame_optr_log" IS '系统表-操作员日志表'; -CREATE TABLE "hme_frame_optr_login" ( - "log_id" int4 NOT NULL, - "optr_id" int4, - "login_name" varchar(64) COLLATE "pg_catalog"."default", - "login_time" timestamp(6), - "browser_type" varchar(128) COLLATE "pg_catalog"."default", - "browser_version" varchar(256) COLLATE "pg_catalog"."default", - "platform_type" varchar(256) COLLATE "pg_catalog"."default", - "platform_series" varchar(256) COLLATE "pg_catalog"."default", - "platform_version" varchar(256) COLLATE "pg_catalog"."default", - "login_addr" varchar(256) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_optr_login" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_optr_login"."log_id" IS '登录编号 '; -COMMENT ON COLUMN "hme_frame_optr_login"."optr_id" IS '操作员编号'; -COMMENT ON COLUMN "hme_frame_optr_login"."login_name" IS '操作员名称'; -COMMENT ON COLUMN "hme_frame_optr_login"."login_time" IS '登录时间'; -COMMENT ON COLUMN "hme_frame_optr_login"."browser_type" IS '浏览器类型'; -COMMENT ON COLUMN "hme_frame_optr_login"."browser_version" IS '浏览器版本'; -COMMENT ON COLUMN "hme_frame_optr_login"."platform_type" IS '操作系统平台'; -COMMENT ON COLUMN "hme_frame_optr_login"."platform_series" IS '操作系统类型'; -COMMENT ON COLUMN "hme_frame_optr_login"."platform_version" IS '操作系统版本'; -COMMENT ON COLUMN "hme_frame_optr_login"."login_addr" IS '登录地址'; +CREATE TABLE "hme_frame_optr_login" ( + "log_id" int4 NOT NULL, + "optr_id" int4, + "login_name" varchar(64) COLLATE "pg_catalog"."default", + "login_time" timestamp(6), + "browser_type" varchar(128) COLLATE "pg_catalog"."default", + "browser_version" varchar(256) COLLATE "pg_catalog"."default", + "platform_type" varchar(256) COLLATE "pg_catalog"."default", + "platform_series" varchar(256) COLLATE "pg_catalog"."default", + "platform_version" varchar(256) COLLATE "pg_catalog"."default", + "login_addr" varchar(256) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_optr_login" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_optr_login"."log_id" IS '登录编号 '; +COMMENT ON COLUMN "hme_frame_optr_login"."optr_id" IS '操作员编号'; +COMMENT ON COLUMN "hme_frame_optr_login"."login_name" IS '操作员名称'; +COMMENT ON COLUMN "hme_frame_optr_login"."login_time" IS '登录时间'; +COMMENT ON COLUMN "hme_frame_optr_login"."browser_type" IS '浏览器类型'; +COMMENT ON COLUMN "hme_frame_optr_login"."browser_version" IS '浏览器版本'; +COMMENT ON COLUMN "hme_frame_optr_login"."platform_type" IS '操作系统平台'; +COMMENT ON COLUMN "hme_frame_optr_login"."platform_series" IS '操作系统类型'; +COMMENT ON COLUMN "hme_frame_optr_login"."platform_version" IS '操作系统版本'; +COMMENT ON COLUMN "hme_frame_optr_login"."login_addr" IS '登录地址'; COMMENT ON TABLE "hme_frame_optr_login" IS '系统表-操作员登录日志'; -CREATE TABLE "hme_frame_optr_role" ( - "optr_id" int4 NOT NULL, - "role_id" int4 NOT NULL -) -; -ALTER TABLE "hme_frame_optr_role" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_optr_role"."optr_id" IS '操作员ID'; -COMMENT ON COLUMN "hme_frame_optr_role"."role_id" IS '角色ID'; +CREATE TABLE "hme_frame_optr_role" ( + "optr_id" int4 NOT NULL, + "role_id" int4 NOT NULL +) +; +ALTER TABLE "hme_frame_optr_role" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_optr_role"."optr_id" IS '操作员ID'; +COMMENT ON COLUMN "hme_frame_optr_role"."role_id" IS '角色ID'; COMMENT ON TABLE "hme_frame_optr_role" IS '系统表-操作员所属角色表'; -CREATE TABLE "hme_frame_param" ( - "param_name" varchar(512) COLLATE "pg_catalog"."default" NOT NULL, - "param_value" varchar(1024) COLLATE "pg_catalog"."default", - "param_status" varchar(1) COLLATE "pg_catalog"."default", - "param_appname" varchar(32) COLLATE "pg_catalog"."default", - "param_note" varchar(1024) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_param" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_param"."param_name" IS '参数名称'; -COMMENT ON COLUMN "hme_frame_param"."param_value" IS '参数值'; -COMMENT ON COLUMN "hme_frame_param"."param_status" IS '参数状态，是否启用，0禁用，1启用'; -COMMENT ON COLUMN "hme_frame_param"."param_appname" IS '是否属于哪个软件专用，如果为空，所有软件专用'; -COMMENT ON COLUMN "hme_frame_param"."param_note" IS '参数描述，尽可能描述清楚'; +CREATE TABLE "hme_frame_param" ( + "param_name" varchar(512) COLLATE "pg_catalog"."default" NOT NULL, + "param_value" varchar(1024) COLLATE "pg_catalog"."default", + "param_status" varchar(1) COLLATE "pg_catalog"."default", + "param_appname" varchar(32) COLLATE "pg_catalog"."default", + "param_note" varchar(1024) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_param" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_param"."param_name" IS '参数名称'; +COMMENT ON COLUMN "hme_frame_param"."param_value" IS '参数值'; +COMMENT ON COLUMN "hme_frame_param"."param_status" IS '参数状态，是否启用，0禁用，1启用'; +COMMENT ON COLUMN "hme_frame_param"."param_appname" IS '是否属于哪个软件专用，如果为空，所有软件专用'; +COMMENT ON COLUMN "hme_frame_param"."param_note" IS '参数描述，尽可能描述清楚'; COMMENT ON TABLE "hme_frame_param" IS '系统表-系统参数定义'; -CREATE TABLE "hme_frame_res" ( - "res_id" int4 NOT NULL, - "res_name" varchar(64) COLLATE "pg_catalog"."default", - "res_alias" varchar(64) COLLATE "pg_catalog"."default", - "res_url" varchar(128) COLLATE "pg_catalog"."default", - "res_pid" int4, - "res_level" int4, - "res_type" varchar(32) COLLATE "pg_catalog"."default", - "res_css" varchar(128) COLLATE "pg_catalog"."default", - "res_status" varchar(1) COLLATE "pg_catalog"."default", - "res_order" int4, - "res_note" varchar(512) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_res" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_res"."res_id" IS '内部编号'; -COMMENT ON COLUMN "hme_frame_res"."res_name" IS '资源名称'; -COMMENT ON COLUMN "hme_frame_res"."res_alias" IS '别名，用于前端权限控制'; -COMMENT ON COLUMN "hme_frame_res"."res_url" IS '资源的地址'; -COMMENT ON COLUMN "hme_frame_res"."res_pid" IS '资源上级ID'; -COMMENT ON COLUMN "hme_frame_res"."res_level" IS '资源级别'; -COMMENT ON COLUMN "hme_frame_res"."res_type" IS '资源类型,Menu,Fun'; -COMMENT ON COLUMN "hme_frame_res"."res_css" IS '资源的样式信息'; -COMMENT ON COLUMN "hme_frame_res"."res_status" IS '资源状态'; -COMMENT ON COLUMN "hme_frame_res"."res_order" IS '排序'; -COMMENT ON COLUMN "hme_frame_res"."res_note" IS '备注信息'; +CREATE TABLE "hme_frame_res" ( + "res_id" int4 NOT NULL, + "res_name" varchar(64) COLLATE "pg_catalog"."default", + "res_alias" varchar(64) COLLATE "pg_catalog"."default", + "res_url" varchar(128) COLLATE "pg_catalog"."default", + "res_pid" int4, + "res_level" int4, + "res_type" varchar(32) COLLATE "pg_catalog"."default", + "res_css" varchar(128) COLLATE "pg_catalog"."default", + "res_status" varchar(1) COLLATE "pg_catalog"."default", + "res_order" int4, + "res_note" varchar(512) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_res" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_res"."res_id" IS '内部编号'; +COMMENT ON COLUMN "hme_frame_res"."res_name" IS '资源名称'; +COMMENT ON COLUMN "hme_frame_res"."res_alias" IS '别名，用于前端权限控制'; +COMMENT ON COLUMN "hme_frame_res"."res_url" IS '资源的地址'; +COMMENT ON COLUMN "hme_frame_res"."res_pid" IS '资源上级ID'; +COMMENT ON COLUMN "hme_frame_res"."res_level" IS '资源级别'; +COMMENT ON COLUMN "hme_frame_res"."res_type" IS '资源类型,Menu,Fun'; +COMMENT ON COLUMN "hme_frame_res"."res_css" IS '资源的样式信息'; +COMMENT ON COLUMN "hme_frame_res"."res_status" IS '资源状态'; +COMMENT ON COLUMN "hme_frame_res"."res_order" IS '排序'; +COMMENT ON COLUMN "hme_frame_res"."res_note" IS '备注信息'; COMMENT ON TABLE "hme_frame_res" IS '系统表-资源定义'; -CREATE TABLE "hme_frame_role" ( - "role_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "role_name" varchar(64) COLLATE "pg_catalog"."default", - "role_status" varchar(1) COLLATE "pg_catalog"."default", - "role_group" varchar(32) COLLATE "pg_catalog"."default", - "home_homepage" varchar(256) COLLATE "pg_catalog"."default", - "role_note" varchar(512) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_role" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_role"."role_id" IS '角色内部编号'; -COMMENT ON COLUMN "hme_frame_role"."role_name" IS '角色名称'; -COMMENT ON COLUMN "hme_frame_role"."role_status" IS '角色状态'; -COMMENT ON COLUMN "hme_frame_role"."role_group" IS '角色类型：扩展用'; -COMMENT ON COLUMN "hme_frame_role"."home_homepage" IS '角色主页'; -COMMENT ON COLUMN "hme_frame_role"."role_note" IS '角色说明'; +CREATE TABLE "hme_frame_role" ( + "role_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "role_name" varchar(64) COLLATE "pg_catalog"."default", + "role_status" varchar(1) COLLATE "pg_catalog"."default", + "role_group" varchar(32) COLLATE "pg_catalog"."default", + "home_homepage" varchar(256) COLLATE "pg_catalog"."default", + "role_note" varchar(512) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_role" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_role"."role_id" IS '角色内部编号'; +COMMENT ON COLUMN "hme_frame_role"."role_name" IS '角色名称'; +COMMENT ON COLUMN "hme_frame_role"."role_status" IS '角色状态'; +COMMENT ON COLUMN "hme_frame_role"."role_group" IS '角色类型：扩展用'; +COMMENT ON COLUMN "hme_frame_role"."home_homepage" IS '角色主页'; +COMMENT ON COLUMN "hme_frame_role"."role_note" IS '角色说明'; COMMENT ON TABLE "hme_frame_role" IS '系统表-角色定义'; -CREATE TABLE "hme_frame_role_res" ( - "role_id" int4 NOT NULL, - "res_id" int4 NOT NULL -) -; -ALTER TABLE "hme_frame_role_res" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_role_res"."role_id" IS '角色内部编号'; -COMMENT ON COLUMN "hme_frame_role_res"."res_id" IS '资源内部编号'; +CREATE TABLE "hme_frame_role_res" ( + "role_id" int4 NOT NULL, + "res_id" int4 NOT NULL +) +; +ALTER TABLE "hme_frame_role_res" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_role_res"."role_id" IS '角色内部编号'; +COMMENT ON COLUMN "hme_frame_role_res"."res_id" IS '资源内部编号'; COMMENT ON TABLE "hme_frame_role_res" IS '系统表-角色拥有的资源定义'; -CREATE TABLE "sample_dataset" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "dataset_name" varchar(128) COLLATE "pg_catalog"."default", - "job_type" varchar(32) COLLATE "pg_catalog"."default", - "voyage_id" int4, - "voyage_name" varchar(255) COLLATE "pg_catalog"."default", - "platform_id" int4, - "platform_type" varchar(255) COLLATE "pg_catalog"."default", - "platform_alias" varchar(64) COLLATE "pg_catalog"."default", - "diving_sn" varchar(255) COLLATE "pg_catalog"."default", - "data_type" varchar(255) COLLATE "pg_catalog"."default", - "equipment_id" int4, - "equipment_alias" varchar(36) COLLATE "pg_catalog"."default", - "equipment_type" varchar(255) COLLATE "pg_catalog"."default", - "data_id" int4, - "data_alias" varchar(32) COLLATE "pg_catalog"."default", - "platform_name" varchar(255) COLLATE "pg_catalog"."default", - "dataset_remark" varchar(255) COLLATE "pg_catalog"."default", - "create_time" timestamp(6), - "driver_left" varchar(64) COLLATE "pg_catalog"."default", - "driver_right" varchar(64) COLLATE "pg_catalog"."default", - "driver_master" varchar(64) COLLATE "pg_catalog"."default", - "driver_unit_left" varchar(64) COLLATE "pg_catalog"."default", - "driver_unit_right" varchar(64) COLLATE "pg_catalog"."default", - "water_in_time" timestamp(6), - "water_out_time" timestamp(6), - "water_minutes" int4, - "bottom_time" timestamp(6), - "throwing_time" timestamp(6), - "receive_time" timestamp(6), - "job_minutes" int4, - "wiring_lon" varchar(32) COLLATE "pg_catalog"."default", - "wiring_lat" varchar(32) COLLATE "pg_catalog"."default", - "wiring_deep" varchar(32) COLLATE "pg_catalog"."default", - "equipment_sn" varchar(255) COLLATE "pg_catalog"."default", - "equipment_model" varchar(32) COLLATE "pg_catalog"."default", - "equipment_time" timestamp(6), - "diving_track_file" varchar(256) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "sample_dataset" OWNER TO "postgres"; -COMMENT ON COLUMN "sample_dataset"."dataset_name" IS '作业编号：航次号_平台+潜次号_设备类型_数据样品类型'; -COMMENT ON COLUMN "sample_dataset"."job_type" IS '作业类型，站位作业，测线作业'; -COMMENT ON COLUMN "sample_dataset"."voyage_id" IS '航次内部编号'; -COMMENT ON COLUMN "sample_dataset"."voyage_name" IS '航次名称（冗余）'; -COMMENT ON COLUMN "sample_dataset"."platform_id" IS '平台内部编号'; -COMMENT ON COLUMN "sample_dataset"."platform_type" IS '平台类型'; -COMMENT ON COLUMN "sample_dataset"."platform_alias" IS '平台简称'; -COMMENT ON COLUMN "sample_dataset"."diving_sn" IS '潜次名称'; -COMMENT ON COLUMN "sample_dataset"."data_type" IS '样品类型'; -COMMENT ON COLUMN "sample_dataset"."equipment_id" IS '设备内部编号'; -COMMENT ON COLUMN "sample_dataset"."equipment_alias" IS '设备简称'; -COMMENT ON COLUMN "sample_dataset"."equipment_type" IS '设备类型'; -COMMENT ON COLUMN "sample_dataset"."data_id" IS '数据样品类型编号'; -COMMENT ON COLUMN "sample_dataset"."data_alias" IS '设备样品类型检测'; -COMMENT ON COLUMN "sample_dataset"."platform_name" IS '平台名称'; -COMMENT ON COLUMN "sample_dataset"."dataset_remark" IS '备注信息'; -COMMENT ON COLUMN "sample_dataset"."create_time" IS '创建时间'; -COMMENT ON COLUMN "sample_dataset"."driver_left" IS '左舷'; -COMMENT ON COLUMN "sample_dataset"."driver_right" IS '右舷'; -COMMENT ON COLUMN "sample_dataset"."driver_master" IS '主驾'; -COMMENT ON COLUMN "sample_dataset"."driver_unit_left" IS '左舷单位'; -COMMENT ON COLUMN "sample_dataset"."driver_unit_right" IS '右舷单位'; -COMMENT ON COLUMN "sample_dataset"."water_in_time" IS '入水时间'; -COMMENT ON COLUMN "sample_dataset"."water_out_time" IS '出水时间'; -COMMENT ON COLUMN "sample_dataset"."water_minutes" IS '水中时间'; -COMMENT ON COLUMN "sample_dataset"."bottom_time" IS '坐底时间'; -COMMENT ON COLUMN "sample_dataset"."throwing_time" IS '抛载时间'; -COMMENT ON COLUMN "sample_dataset"."receive_time" IS '回收时间'; -COMMENT ON COLUMN "sample_dataset"."job_minutes" IS '作业时间'; -COMMENT ON COLUMN "sample_dataset"."wiring_lon" IS '布放经度'; -COMMENT ON COLUMN "sample_dataset"."wiring_lat" IS '布放纬度'; -COMMENT ON COLUMN "sample_dataset"."wiring_deep" IS '布放深度'; -COMMENT ON COLUMN "sample_dataset"."equipment_sn" IS '设备编号'; -COMMENT ON COLUMN "sample_dataset"."equipment_model" IS '设备型号'; -COMMENT ON COLUMN "sample_dataset"."equipment_time" IS '设备定标时间'; -COMMENT ON COLUMN "sample_dataset"."diving_track_file" IS '潜水器轨迹文件'; +CREATE TABLE "sample_dataset" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "dataset_name" varchar(128) COLLATE "pg_catalog"."default", + "job_type" varchar(32) COLLATE "pg_catalog"."default", + "voyage_id" int4, + "voyage_name" varchar(255) COLLATE "pg_catalog"."default", + "platform_id" int4, + "platform_type" varchar(255) COLLATE "pg_catalog"."default", + "platform_alias" varchar(64) COLLATE "pg_catalog"."default", + "diving_sn" varchar(255) COLLATE "pg_catalog"."default", + "data_type" varchar(255) COLLATE "pg_catalog"."default", + "equipment_id" int4, + "equipment_alias" varchar(36) COLLATE "pg_catalog"."default", + "equipment_type" varchar(255) COLLATE "pg_catalog"."default", + "data_id" int4, + "data_alias" varchar(32) COLLATE "pg_catalog"."default", + "platform_name" varchar(255) COLLATE "pg_catalog"."default", + "dataset_remark" varchar(255) COLLATE "pg_catalog"."default", + "create_time" timestamp(6), + "driver_left" varchar(64) COLLATE "pg_catalog"."default", + "driver_right" varchar(64) COLLATE "pg_catalog"."default", + "driver_master" varchar(64) COLLATE "pg_catalog"."default", + "driver_unit_left" varchar(64) COLLATE "pg_catalog"."default", + "driver_unit_right" varchar(64) COLLATE "pg_catalog"."default", + "water_in_time" timestamp(6), + "water_out_time" timestamp(6), + "water_minutes" int4, + "bottom_time" timestamp(6), + "throwing_time" timestamp(6), + "receive_time" timestamp(6), + "job_minutes" int4, + "wiring_lon" varchar(32) COLLATE "pg_catalog"."default", + "wiring_lat" varchar(32) COLLATE "pg_catalog"."default", + "wiring_deep" varchar(32) COLLATE "pg_catalog"."default", + "equipment_sn" varchar(255) COLLATE "pg_catalog"."default", + "equipment_model" varchar(32) COLLATE "pg_catalog"."default", + "equipment_time" timestamp(6), + "diving_track_file" varchar(256) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "sample_dataset" OWNER TO "postgres"; +COMMENT ON COLUMN "sample_dataset"."dataset_name" IS '作业编号：航次号_平台+潜次号_设备类型_数据样品类型'; +COMMENT ON COLUMN "sample_dataset"."job_type" IS '作业类型，站位作业，测线作业'; +COMMENT ON COLUMN "sample_dataset"."voyage_id" IS '航次内部编号'; +COMMENT ON COLUMN "sample_dataset"."voyage_name" IS '航次名称（冗余）'; +COMMENT ON COLUMN "sample_dataset"."platform_id" IS '平台内部编号'; +COMMENT ON COLUMN "sample_dataset"."platform_type" IS '平台类型'; +COMMENT ON COLUMN "sample_dataset"."platform_alias" IS '平台简称'; +COMMENT ON COLUMN "sample_dataset"."diving_sn" IS '潜次名称'; +COMMENT ON COLUMN "sample_dataset"."data_type" IS '样品类型'; +COMMENT ON COLUMN "sample_dataset"."equipment_id" IS '设备内部编号'; +COMMENT ON COLUMN "sample_dataset"."equipment_alias" IS '设备简称'; +COMMENT ON COLUMN "sample_dataset"."equipment_type" IS '设备类型'; +COMMENT ON COLUMN "sample_dataset"."data_id" IS '数据样品类型编号'; +COMMENT ON COLUMN "sample_dataset"."data_alias" IS '设备样品类型检测'; +COMMENT ON COLUMN "sample_dataset"."platform_name" IS '平台名称'; +COMMENT ON COLUMN "sample_dataset"."dataset_remark" IS '备注信息'; +COMMENT ON COLUMN "sample_dataset"."create_time" IS '创建时间'; +COMMENT ON COLUMN "sample_dataset"."driver_left" IS '左舷'; +COMMENT ON COLUMN "sample_dataset"."driver_right" IS '右舷'; +COMMENT ON COLUMN "sample_dataset"."driver_master" IS '主驾'; +COMMENT ON COLUMN "sample_dataset"."driver_unit_left" IS '左舷单位'; +COMMENT ON COLUMN "sample_dataset"."driver_unit_right" IS '右舷单位'; +COMMENT ON COLUMN "sample_dataset"."water_in_time" IS '入水时间'; +COMMENT ON COLUMN "sample_dataset"."water_out_time" IS '出水时间'; +COMMENT ON COLUMN "sample_dataset"."water_minutes" IS '水中时间'; +COMMENT ON COLUMN "sample_dataset"."bottom_time" IS '坐底时间'; +COMMENT ON COLUMN "sample_dataset"."throwing_time" IS '抛载时间'; +COMMENT ON COLUMN "sample_dataset"."receive_time" IS '回收时间'; +COMMENT ON COLUMN "sample_dataset"."job_minutes" IS '作业时间'; +COMMENT ON COLUMN "sample_dataset"."wiring_lon" IS '布放经度'; +COMMENT ON COLUMN "sample_dataset"."wiring_lat" IS '布放纬度'; +COMMENT ON COLUMN "sample_dataset"."wiring_deep" IS '布放深度'; +COMMENT ON COLUMN "sample_dataset"."equipment_sn" IS '设备编号'; +COMMENT ON COLUMN "sample_dataset"."equipment_model" IS '设备型号'; +COMMENT ON COLUMN "sample_dataset"."equipment_time" IS '设备定标时间'; +COMMENT ON COLUMN "sample_dataset"."diving_track_file" IS '潜水器轨迹文件'; COMMENT ON TABLE "sample_dataset" IS '数据样品数据集'; -CREATE TABLE "sample_dataset_track" ( - "tsy_id" int4 NOT NULL, - "dataset_id" int4, - "track_lon" varchar(32) COLLATE "pg_catalog"."default", - "track_lat" varchar(32) COLLATE "pg_catalog"."default", - "track_time" timestamp(6) -) -; -ALTER TABLE "sample_dataset_track" OWNER TO "postgres"; -COMMENT ON COLUMN "sample_dataset_track"."dataset_id" IS '数据集编号'; -COMMENT ON COLUMN "sample_dataset_track"."track_lon" IS '经度'; -COMMENT ON COLUMN "sample_dataset_track"."track_lat" IS '纬度'; -COMMENT ON COLUMN "sample_dataset_track"."track_time" IS '时间'; +CREATE TABLE "sample_dataset_track" ( + "tsy_id" int4 NOT NULL, + "dataset_id" int4, + "track_lon" varchar(32) COLLATE "pg_catalog"."default", + "track_lat" varchar(32) COLLATE "pg_catalog"."default", + "track_time" timestamp(6) +) +; +ALTER TABLE "sample_dataset_track" OWNER TO "postgres"; +COMMENT ON COLUMN "sample_dataset_track"."dataset_id" IS '数据集编号'; +COMMENT ON COLUMN "sample_dataset_track"."track_lon" IS '经度'; +COMMENT ON COLUMN "sample_dataset_track"."track_lat" IS '纬度'; +COMMENT ON COLUMN "sample_dataset_track"."track_time" IS '时间'; COMMENT ON TABLE "sample_dataset_track" IS '潜水器轨迹文件'; -CREATE TABLE "sample_line" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "dataset_id" int4, - "dataset_name" varchar(128) COLLATE "pg_catalog"."default", - "sample_name" varchar(255) COLLATE "pg_catalog"."default", - "sample_seq" varchar(32) COLLATE "pg_catalog"."default", - "funding_org" varchar(128) COLLATE "pg_catalog"."default", - "publish_rule" varchar(32) COLLATE "pg_catalog"."default", - "line_sn" varchar(32) COLLATE "pg_catalog"."default", - "line_deep" varchar(32) COLLATE "pg_catalog"."default", - "start_lon" varchar(32) COLLATE "pg_catalog"."default", - "start_lat" varchar(32) COLLATE "pg_catalog"."default", - "end_lon" varchar(32) COLLATE "pg_catalog"."default", - "end_lat" varchar(32) COLLATE "pg_catalog"."default", - "start_time" timestamp(6), - "end_time" timestamp(6), - "track_file_name" varchar(256) COLLATE "pg_catalog"."default", - "sample_format" varchar(256) COLLATE "pg_catalog"."default", - "sample_status" varchar(32) COLLATE "pg_catalog"."default", - "sample_tag_name" varchar(256) COLLATE "pg_catalog"."default", - "sample_tag_value" varchar(256) COLLATE "pg_catalog"."default", - "sample_remark" varchar(2000) COLLATE "pg_catalog"."default", - "create_time" timestamp(6), - "conver_width" int4, - "conver_area" int4 -) -; -ALTER TABLE "sample_line" OWNER TO "postgres"; -COMMENT ON COLUMN "sample_line"."dataset_id" IS '数据集编号'; -COMMENT ON COLUMN "sample_line"."dataset_name" IS '数据集名称'; -COMMENT ON COLUMN "sample_line"."sample_name" IS '数据样品编号'; -COMMENT ON COLUMN "sample_line"."sample_seq" IS '数据样品在数据集内部编号'; -COMMENT ON COLUMN "sample_line"."funding_org" IS '赞助机构'; -COMMENT ON COLUMN "sample_line"."publish_rule" IS '公开期限'; -COMMENT ON COLUMN "sample_line"."line_sn" IS '测线号'; -COMMENT ON COLUMN "sample_line"."line_deep" IS '测线深度'; -COMMENT ON COLUMN "sample_line"."start_lon" IS '开始经度'; -COMMENT ON COLUMN "sample_line"."start_lat" IS '开始纬度'; -COMMENT ON COLUMN "sample_line"."end_lon" IS '结束经度'; -COMMENT ON COLUMN "sample_line"."end_lat" IS '结束纬度'; -COMMENT ON COLUMN "sample_line"."start_time" IS '开始时间'; -COMMENT ON COLUMN "sample_line"."end_time" IS '结束时间'; -COMMENT ON COLUMN "sample_line"."track_file_name" IS '上传测线轨迹文件名称'; -COMMENT ON COLUMN "sample_line"."sample_format" IS '数据格式'; -COMMENT ON COLUMN "sample_line"."sample_status" IS '原始数据、预处理数据、后处理数据'; -COMMENT ON COLUMN "sample_line"."sample_tag_name" IS '应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次'; -COMMENT ON COLUMN "sample_line"."sample_tag_value" IS '标签对应的值，用于关联第三方系统'; -COMMENT ON COLUMN "sample_line"."sample_remark" IS '备注信息'; -COMMENT ON COLUMN "sample_line"."create_time" IS '创建时间'; -COMMENT ON COLUMN "sample_line"."conver_width" IS '覆盖宽度'; -COMMENT ON COLUMN "sample_line"."conver_area" IS '计算出来的覆盖面积'; +CREATE TABLE "sample_line" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "dataset_id" int4, + "dataset_name" varchar(128) COLLATE "pg_catalog"."default", + "sample_name" varchar(255) COLLATE "pg_catalog"."default", + "sample_seq" varchar(32) COLLATE "pg_catalog"."default", + "funding_org" varchar(128) COLLATE "pg_catalog"."default", + "publish_rule" varchar(32) COLLATE "pg_catalog"."default", + "line_sn" varchar(32) COLLATE "pg_catalog"."default", + "line_deep" varchar(32) COLLATE "pg_catalog"."default", + "start_lon" varchar(32) COLLATE "pg_catalog"."default", + "start_lat" varchar(32) COLLATE "pg_catalog"."default", + "end_lon" varchar(32) COLLATE "pg_catalog"."default", + "end_lat" varchar(32) COLLATE "pg_catalog"."default", + "start_time" timestamp(6), + "end_time" timestamp(6), + "track_file_name" varchar(256) COLLATE "pg_catalog"."default", + "sample_format" varchar(256) COLLATE "pg_catalog"."default", + "sample_status" varchar(32) COLLATE "pg_catalog"."default", + "sample_tag_name" varchar(256) COLLATE "pg_catalog"."default", + "sample_tag_value" varchar(256) COLLATE "pg_catalog"."default", + "sample_remark" varchar(2000) COLLATE "pg_catalog"."default", + "create_time" timestamp(6), + "conver_width" int4, + "conver_area" int4 +) +; +ALTER TABLE "sample_line" OWNER TO "postgres"; +COMMENT ON COLUMN "sample_line"."dataset_id" IS '数据集编号'; +COMMENT ON COLUMN "sample_line"."dataset_name" IS '数据集名称'; +COMMENT ON COLUMN "sample_line"."sample_name" IS '数据样品编号'; +COMMENT ON COLUMN "sample_line"."sample_seq" IS '数据样品在数据集内部编号'; +COMMENT ON COLUMN "sample_line"."funding_org" IS '赞助机构'; +COMMENT ON COLUMN "sample_line"."publish_rule" IS '公开期限'; +COMMENT ON COLUMN "sample_line"."line_sn" IS '测线号'; +COMMENT ON COLUMN "sample_line"."line_deep" IS '测线深度'; +COMMENT ON COLUMN "sample_line"."start_lon" IS '开始经度'; +COMMENT ON COLUMN "sample_line"."start_lat" IS '开始纬度'; +COMMENT ON COLUMN "sample_line"."end_lon" IS '结束经度'; +COMMENT ON COLUMN "sample_line"."end_lat" IS '结束纬度'; +COMMENT ON COLUMN "sample_line"."start_time" IS '开始时间'; +COMMENT ON COLUMN "sample_line"."end_time" IS '结束时间'; +COMMENT ON COLUMN "sample_line"."track_file_name" IS '上传测线轨迹文件名称'; +COMMENT ON COLUMN "sample_line"."sample_format" IS '数据格式'; +COMMENT ON COLUMN "sample_line"."sample_status" IS '原始数据、预处理数据、后处理数据'; +COMMENT ON COLUMN "sample_line"."sample_tag_name" IS '应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次'; +COMMENT ON COLUMN "sample_line"."sample_tag_value" IS '标签对应的值，用于关联第三方系统'; +COMMENT ON COLUMN "sample_line"."sample_remark" IS '备注信息'; +COMMENT ON COLUMN "sample_line"."create_time" IS '创建时间'; +COMMENT ON COLUMN "sample_line"."conver_width" IS '覆盖宽度'; +COMMENT ON COLUMN "sample_line"."conver_area" IS '计算出来的覆盖面积'; COMMENT ON TABLE "sample_line" IS '数据样品-测线作业'; -CREATE TABLE "sample_line_track" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "dataset_id" int4, - "line_id" int4, - "track_index" varchar(32) COLLATE "pg_catalog"."default", - "track_lon" varchar(32) COLLATE "pg_catalog"."default", - "track_lat" varchar(32) COLLATE "pg_catalog"."default", - "track_time" timestamp(6) -) -; -ALTER TABLE "sample_line_track" OWNER TO "postgres"; -COMMENT ON COLUMN "sample_line_track"."dataset_id" IS '数据集内部编号'; -COMMENT ON COLUMN "sample_line_track"."line_id" IS '测线作业内部编号'; -COMMENT ON COLUMN "sample_line_track"."track_index" IS '步骤'; -COMMENT ON COLUMN "sample_line_track"."track_lon" IS '轨迹经度'; -COMMENT ON COLUMN "sample_line_track"."track_lat" IS '轨迹纬度'; -COMMENT ON COLUMN "sample_line_track"."track_time" IS '轨迹时间'; +CREATE TABLE "sample_line_track" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "dataset_id" int4, + "line_id" int4, + "track_index" varchar(32) COLLATE "pg_catalog"."default", + "track_lon" varchar(32) COLLATE "pg_catalog"."default", + "track_lat" varchar(32) COLLATE "pg_catalog"."default", + "track_time" timestamp(6) +) +; +ALTER TABLE "sample_line_track" OWNER TO "postgres"; +COMMENT ON COLUMN "sample_line_track"."dataset_id" IS '数据集内部编号'; +COMMENT ON COLUMN "sample_line_track"."line_id" IS '测线作业内部编号'; +COMMENT ON COLUMN "sample_line_track"."track_index" IS '步骤'; +COMMENT ON COLUMN "sample_line_track"."track_lon" IS '轨迹经度'; +COMMENT ON COLUMN "sample_line_track"."track_lat" IS '轨迹纬度'; +COMMENT ON COLUMN "sample_line_track"."track_time" IS '轨迹时间'; COMMENT ON TABLE "sample_line_track" IS '测线轨迹'; -CREATE TABLE "sample_station" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "dataset_id" int4, - "dataset_name" varchar(128) COLLATE "pg_catalog"."default", - "sample_name" varchar(255) COLLATE "pg_catalog"."default", - "sample_seq" varchar(32) COLLATE "pg_catalog"."default", - "funding_org" varchar(128) COLLATE "pg_catalog"."default", - "publish_rule" varchar(32) COLLATE "pg_catalog"."default", - "sampling_time" timestamp(6), - "sampling_lon" varchar(32) COLLATE "pg_catalog"."default", - "sampling_lat" varchar(32) COLLATE "pg_catalog"."default", - "sampling_deep" varchar(32) COLLATE "pg_catalog"."default", - "sample_remark" varchar(2000) COLLATE "pg_catalog"."default", - "create_time" timestamp(6), - "sample_tag_name" varchar(256) COLLATE "pg_catalog"."default", - "sample_tag_value" varchar(256) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "sample_station" OWNER TO "postgres"; -COMMENT ON COLUMN "sample_station"."dataset_id" IS '数据集编号'; -COMMENT ON COLUMN "sample_station"."dataset_name" IS '数据集名称'; -COMMENT ON COLUMN "sample_station"."sample_name" IS '数据样品编号'; -COMMENT ON COLUMN "sample_station"."sample_seq" IS '数据样品在数据集内部编号'; -COMMENT ON COLUMN "sample_station"."funding_org" IS '赞助机构'; -COMMENT ON COLUMN "sample_station"."publish_rule" IS '公开期限'; -COMMENT ON COLUMN "sample_station"."sampling_time" IS '采样时间'; -COMMENT ON COLUMN "sample_station"."sampling_lon" IS '经度'; -COMMENT ON COLUMN "sample_station"."sampling_lat" IS '纬度'; -COMMENT ON COLUMN "sample_station"."sampling_deep" IS '深度'; -COMMENT ON COLUMN "sample_station"."sample_remark" IS '备注说明'; -COMMENT ON COLUMN "sample_station"."sample_tag_name" IS '应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次'; -COMMENT ON COLUMN "sample_station"."sample_tag_value" IS '标签对应的值，用于关联第三方系统'; +CREATE TABLE "sample_station" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "dataset_id" int4, + "dataset_name" varchar(128) COLLATE "pg_catalog"."default", + "sample_name" varchar(255) COLLATE "pg_catalog"."default", + "sample_seq" varchar(32) COLLATE "pg_catalog"."default", + "funding_org" varchar(128) COLLATE "pg_catalog"."default", + "publish_rule" varchar(32) COLLATE "pg_catalog"."default", + "sampling_time" timestamp(6), + "sampling_lon" varchar(32) COLLATE "pg_catalog"."default", + "sampling_lat" varchar(32) COLLATE "pg_catalog"."default", + "sampling_deep" varchar(32) COLLATE "pg_catalog"."default", + "sample_remark" varchar(2000) COLLATE "pg_catalog"."default", + "create_time" timestamp(6), + "sample_tag_name" varchar(256) COLLATE "pg_catalog"."default", + "sample_tag_value" varchar(256) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "sample_station" OWNER TO "postgres"; +COMMENT ON COLUMN "sample_station"."dataset_id" IS '数据集编号'; +COMMENT ON COLUMN "sample_station"."dataset_name" IS '数据集名称'; +COMMENT ON COLUMN "sample_station"."sample_name" IS '数据样品编号'; +COMMENT ON COLUMN "sample_station"."sample_seq" IS '数据样品在数据集内部编号'; +COMMENT ON COLUMN "sample_station"."funding_org" IS '赞助机构'; +COMMENT ON COLUMN "sample_station"."publish_rule" IS '公开期限'; +COMMENT ON COLUMN "sample_station"."sampling_time" IS '采样时间'; +COMMENT ON COLUMN "sample_station"."sampling_lon" IS '经度'; +COMMENT ON COLUMN "sample_station"."sampling_lat" IS '纬度'; +COMMENT ON COLUMN "sample_station"."sampling_deep" IS '深度'; +COMMENT ON COLUMN "sample_station"."sample_remark" IS '备注说明'; +COMMENT ON COLUMN "sample_station"."sample_tag_name" IS '应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次'; +COMMENT ON COLUMN "sample_station"."sample_tag_value" IS '标签对应的值，用于关联第三方系统'; COMMENT ON TABLE "sample_station" IS '样品信息表-站位作业'; -CREATE TABLE "sample_station_track" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "sample_id" int4, - "nav_lon" varchar(32) COLLATE "pg_catalog"."default", - "nav_lat" varchar(32) COLLATE "pg_catalog"."default", - "nav_time" timestamp(6) -) -; -ALTER TABLE "sample_station_track" OWNER TO "postgres"; -COMMENT ON COLUMN "sample_station_track"."sample_id" IS '航次编号'; -COMMENT ON COLUMN "sample_station_track"."nav_lon" IS '经度'; -COMMENT ON COLUMN "sample_station_track"."nav_lat" IS '纬度'; -COMMENT ON COLUMN "sample_station_track"."nav_time" IS '时间'; +CREATE TABLE "sample_station_track" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "sample_id" int4, + "nav_lon" varchar(32) COLLATE "pg_catalog"."default", + "nav_lat" varchar(32) COLLATE "pg_catalog"."default", + "nav_time" timestamp(6) +) +; +ALTER TABLE "sample_station_track" OWNER TO "postgres"; +COMMENT ON COLUMN "sample_station_track"."sample_id" IS '航次编号'; +COMMENT ON COLUMN "sample_station_track"."nav_lon" IS '经度'; +COMMENT ON COLUMN "sample_station_track"."nav_lat" IS '纬度'; +COMMENT ON COLUMN "sample_station_track"."nav_time" IS '时间'; COMMENT ON TABLE "sample_station_track" IS '航次-导航文件'; -CREATE TABLE "voyage_log" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "voyage_id" int4, - "optr_id" int4, - "optr_name" varchar(32) COLLATE "pg_catalog"."default", - "login_name" varchar(64) COLLATE "pg_catalog"."default", - "log_type" varchar(32) COLLATE "pg_catalog"."default", - "log_value" varchar(2000) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "voyage_log" OWNER TO "postgres"; -COMMENT ON COLUMN "voyage_log"."voyage_id" IS '航次名称'; -COMMENT ON COLUMN "voyage_log"."optr_id" IS '操作员编号'; -COMMENT ON COLUMN "voyage_log"."optr_name" IS '操作员名称'; -COMMENT ON COLUMN "voyage_log"."login_name" IS '登录名称'; -COMMENT ON COLUMN "voyage_log"."log_type" IS '日志类型'; -COMMENT ON COLUMN "voyage_log"."log_value" IS '日志值'; +CREATE TABLE "voyage_log" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "voyage_id" int4, + "optr_id" int4, + "optr_name" varchar(32) COLLATE "pg_catalog"."default", + "login_name" varchar(64) COLLATE "pg_catalog"."default", + "log_type" varchar(32) COLLATE "pg_catalog"."default", + "log_value" varchar(2000) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "voyage_log" OWNER TO "postgres"; +COMMENT ON COLUMN "voyage_log"."voyage_id" IS '航次名称'; +COMMENT ON COLUMN "voyage_log"."optr_id" IS '操作员编号'; +COMMENT ON COLUMN "voyage_log"."optr_name" IS '操作员名称'; +COMMENT ON COLUMN "voyage_log"."login_name" IS '登录名称'; +COMMENT ON COLUMN "voyage_log"."log_type" IS '日志类型'; +COMMENT ON COLUMN "voyage_log"."log_value" IS '日志值'; COMMENT ON TABLE "voyage_log" IS '航次日志记录'; -CREATE TABLE "voyage_member" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "voyage_id" int4, - "file_id" int4, - "member_name" varchar(255) COLLATE "pg_catalog"."default", - "member_sex" varchar(255) COLLATE "pg_catalog"."default", - "member_birthday" varchar(255) COLLATE "pg_catalog"."default", - "member_unit" varchar(255) COLLATE "pg_catalog"."default", - "member_dept" varchar(255) COLLATE "pg_catalog"."default", - "member_tel" varchar(255) COLLATE "pg_catalog"."default", - "member_cert" varchar(255) COLLATE "pg_catalog"."default", - "bank_name" varchar(255) COLLATE "pg_catalog"."default", - "bank_card" varchar(255) COLLATE "pg_catalog"."default", - "bank_addr" varchar(255) COLLATE "pg_catalog"."default", - "member_remark" varchar(255) COLLATE "pg_catalog"."default", - "ship_room_addr" varchar(64) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "voyage_member" OWNER TO "postgres"; -COMMENT ON COLUMN "voyage_member"."voyage_id" IS '航次编号'; -COMMENT ON COLUMN "voyage_member"."file_id" IS '对应文件名称'; -COMMENT ON COLUMN "voyage_member"."member_name" IS '参航人员姓名'; -COMMENT ON COLUMN "voyage_member"."member_sex" IS '参航人员性别'; -COMMENT ON COLUMN "voyage_member"."member_birthday" IS '参航人员生日'; -COMMENT ON COLUMN "voyage_member"."member_unit" IS '参航人员单位'; -COMMENT ON COLUMN "voyage_member"."member_dept" IS '参航人员职责'; -COMMENT ON COLUMN "voyage_member"."member_tel" IS '联系电话'; -COMMENT ON COLUMN "voyage_member"."member_cert" IS '证件号码'; -COMMENT ON COLUMN "voyage_member"."bank_name" IS '银行名称'; -COMMENT ON COLUMN "voyage_member"."bank_card" IS '银行卡号码'; -COMMENT ON COLUMN "voyage_member"."bank_addr" IS '开户行'; -COMMENT ON COLUMN "voyage_member"."ship_room_addr" IS '船上房间号码'; +CREATE TABLE "voyage_member" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "voyage_id" int4, + "file_id" int4, + "member_name" varchar(255) COLLATE "pg_catalog"."default", + "member_sex" varchar(255) COLLATE "pg_catalog"."default", + "member_birthday" varchar(255) COLLATE "pg_catalog"."default", + "member_unit" varchar(255) COLLATE "pg_catalog"."default", + "member_dept" varchar(255) COLLATE "pg_catalog"."default", + "member_tel" varchar(255) COLLATE "pg_catalog"."default", + "member_cert" varchar(255) COLLATE "pg_catalog"."default", + "bank_name" varchar(255) COLLATE "pg_catalog"."default", + "bank_card" varchar(255) COLLATE "pg_catalog"."default", + "bank_addr" varchar(255) COLLATE "pg_catalog"."default", + "member_remark" varchar(255) COLLATE "pg_catalog"."default", + "ship_room_addr" varchar(64) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "voyage_member" OWNER TO "postgres"; +COMMENT ON COLUMN "voyage_member"."voyage_id" IS '航次编号'; +COMMENT ON COLUMN "voyage_member"."file_id" IS '对应文件名称'; +COMMENT ON COLUMN "voyage_member"."member_name" IS '参航人员姓名'; +COMMENT ON COLUMN "voyage_member"."member_sex" IS '参航人员性别'; +COMMENT ON COLUMN "voyage_member"."member_birthday" IS '参航人员生日'; +COMMENT ON COLUMN "voyage_member"."member_unit" IS '参航人员单位'; +COMMENT ON COLUMN "voyage_member"."member_dept" IS '参航人员职责'; +COMMENT ON COLUMN "voyage_member"."member_tel" IS '联系电话'; +COMMENT ON COLUMN "voyage_member"."member_cert" IS '证件号码'; +COMMENT ON COLUMN "voyage_member"."bank_name" IS '银行名称'; +COMMENT ON COLUMN "voyage_member"."bank_card" IS '银行卡号码'; +COMMENT ON COLUMN "voyage_member"."bank_addr" IS '开户行'; +COMMENT ON COLUMN "voyage_member"."ship_room_addr" IS '船上房间号码'; COMMENT ON TABLE "voyage_member" IS '航次参航人员信息'; -CREATE TABLE "voyage_navigation" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "voyage_id" int4, - "file_id" int4, - "nav_lon" varchar(32) COLLATE "pg_catalog"."default", - "nav_lat" varchar(32) COLLATE "pg_catalog"."default", - "nav_time" timestamp(6) -) -; -ALTER TABLE "voyage_navigation" OWNER TO "postgres"; -COMMENT ON COLUMN "voyage_navigation"."voyage_id" IS '航次编号'; -COMMENT ON COLUMN "voyage_navigation"."file_id" IS '导航文件编号'; -COMMENT ON COLUMN "voyage_navigation"."nav_lon" IS '经度'; -COMMENT ON COLUMN "voyage_navigation"."nav_lat" IS '纬度'; -COMMENT ON COLUMN "voyage_navigation"."nav_time" IS '时间'; +CREATE TABLE "voyage_navigation" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "voyage_id" int4, + "file_id" int4, + "nav_lon" varchar(32) COLLATE "pg_catalog"."default", + "nav_lat" varchar(32) COLLATE "pg_catalog"."default", + "nav_time" timestamp(6) +) +; +ALTER TABLE "voyage_navigation" OWNER TO "postgres"; +COMMENT ON COLUMN "voyage_navigation"."voyage_id" IS '航次编号'; +COMMENT ON COLUMN "voyage_navigation"."file_id" IS '导航文件编号'; +COMMENT ON COLUMN "voyage_navigation"."nav_lon" IS '经度'; +COMMENT ON COLUMN "voyage_navigation"."nav_lat" IS '纬度'; +COMMENT ON COLUMN "voyage_navigation"."nav_time" IS '时间'; COMMENT ON TABLE "voyage_navigation" IS '航次-导航文件'; -CREATE TABLE "voyage_reg" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "voyage_name" varchar(64) COLLATE "pg_catalog"."default", - "ship_name" varchar(64) COLLATE "pg_catalog"."default", - "serect_status" varchar(32) COLLATE "pg_catalog"."default", - "voyage_start_date" date, - "voyage_end_date" date, - "voyage_remark" varchar(10240) COLLATE "pg_catalog"."default", - "voyage_officer" varchar(255) COLLATE "pg_catalog"."default", - "funding_org" varchar(255) COLLATE "pg_catalog"."default", - "funding_code" varchar(255) COLLATE "pg_catalog"."default", - "navigation_file_name" varchar(128) COLLATE "pg_catalog"."default", - "create_time" timestamp(6), - "voyage_status" varchar(32) COLLATE "pg_catalog"."default", - "voyage_status_time" timestamp(6), - "voyage_mileage" int4, - "voyage_days" int4 -) -; -ALTER TABLE "voyage_reg" OWNER TO "postgres"; -COMMENT ON COLUMN "voyage_reg"."voyage_name" IS '航次名称'; -COMMENT ON COLUMN "voyage_reg"."ship_name" IS '科考船舶'; -COMMENT ON COLUMN "voyage_reg"."serect_status" IS '是否涉密'; -COMMENT ON COLUMN "voyage_reg"."voyage_start_date" IS '航行开始日期'; -COMMENT ON COLUMN "voyage_reg"."voyage_end_date" IS '航行结束日期'; -COMMENT ON COLUMN "voyage_reg"."voyage_remark" IS '航线描述'; -COMMENT ON COLUMN "voyage_reg"."voyage_officer" IS '首席，用、分开'; -COMMENT ON COLUMN "voyage_reg"."funding_org" IS '项目资助机构，用、分开'; -COMMENT ON COLUMN "voyage_reg"."funding_code" IS '项目资助编号'; -COMMENT ON COLUMN "voyage_reg"."navigation_file_name" IS '导航文件名称'; -COMMENT ON COLUMN "voyage_reg"."create_time" IS '创建时间'; -COMMENT ON COLUMN "voyage_reg"."voyage_status" IS '航次状态'; -COMMENT ON COLUMN "voyage_reg"."voyage_status_time" IS '状态变更时间'; -COMMENT ON COLUMN "voyage_reg"."voyage_mileage" IS '航行里程'; -COMMENT ON COLUMN "voyage_reg"."voyage_days" IS '航线天数，自动计算'; +CREATE TABLE "voyage_reg" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "voyage_name" varchar(64) COLLATE "pg_catalog"."default", + "ship_name" varchar(64) COLLATE "pg_catalog"."default", + "serect_status" varchar(32) COLLATE "pg_catalog"."default", + "voyage_start_date" date, + "voyage_end_date" date, + "voyage_remark" varchar(10240) COLLATE "pg_catalog"."default", + "voyage_officer" varchar(255) COLLATE "pg_catalog"."default", + "funding_org" varchar(255) COLLATE "pg_catalog"."default", + "funding_code" varchar(255) COLLATE "pg_catalog"."default", + "navigation_file_name" varchar(128) COLLATE "pg_catalog"."default", + "create_time" timestamp(6), + "voyage_status" varchar(32) COLLATE "pg_catalog"."default", + "voyage_status_time" timestamp(6), + "voyage_mileage" int4, + "voyage_days" int4 +) +; +ALTER TABLE "voyage_reg" OWNER TO "postgres"; +COMMENT ON COLUMN "voyage_reg"."voyage_name" IS '航次名称'; +COMMENT ON COLUMN "voyage_reg"."ship_name" IS '科考船舶'; +COMMENT ON COLUMN "voyage_reg"."serect_status" IS '是否涉密'; +COMMENT ON COLUMN "voyage_reg"."voyage_start_date" IS '航行开始日期'; +COMMENT ON COLUMN "voyage_reg"."voyage_end_date" IS '航行结束日期'; +COMMENT ON COLUMN "voyage_reg"."voyage_remark" IS '航线描述'; +COMMENT ON COLUMN "voyage_reg"."voyage_officer" IS '首席，用、分开'; +COMMENT ON COLUMN "voyage_reg"."funding_org" IS '项目资助机构，用、分开'; +COMMENT ON COLUMN "voyage_reg"."funding_code" IS '项目资助编号'; +COMMENT ON COLUMN "voyage_reg"."navigation_file_name" IS '导航文件名称'; +COMMENT ON COLUMN "voyage_reg"."create_time" IS '创建时间'; +COMMENT ON COLUMN "voyage_reg"."voyage_status" IS '航次状态'; +COMMENT ON COLUMN "voyage_reg"."voyage_status_time" IS '状态变更时间'; +COMMENT ON COLUMN "voyage_reg"."voyage_mileage" IS '航行里程'; +COMMENT ON COLUMN "voyage_reg"."voyage_days" IS '航线天数，自动计算'; COMMENT ON TABLE "voyage_reg" IS '航次信息表'; -CREATE TABLE "voyage_reg_optr" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "optr_id" int4, - "voyage_id" int4 -) -; -ALTER TABLE "voyage_reg_optr" OWNER TO "postgres"; -COMMENT ON COLUMN "voyage_reg_optr"."optr_id" IS '操作员编号'; -COMMENT ON COLUMN "voyage_reg_optr"."voyage_id" IS '航次编号'; +CREATE TABLE "voyage_reg_optr" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "optr_id" int4, + "voyage_id" int4 +) +; +ALTER TABLE "voyage_reg_optr" OWNER TO "postgres"; +COMMENT ON COLUMN "voyage_reg_optr"."optr_id" IS '操作员编号'; +COMMENT ON COLUMN "voyage_reg_optr"."voyage_id" IS '航次编号'; COMMENT ON TABLE "voyage_reg_optr" IS '操作员-航次对应表'; BEGIN; LOCK TABLE "public"."dict_data" IN SHARE MODE; @@ -1196,8 +1196,8 @@ ALTER TABLE "hme_frame_dict" ADD CONSTRAINT "hme_frame_dict_pkey" PRIMARY KEY (" ALTER TABLE "hme_frame_dict_name" ADD CONSTRAINT "hme_frame_dict_name_pkey" PRIMARY KEY ("dict_name"); ALTER TABLE "hme_frame_language" ADD CONSTRAINT "hme_frame_language_pkey" PRIMARY KEY ("lang_key"); ALTER TABLE "hme_frame_optr" ADD CONSTRAINT "hme_frame_optr_pkey" PRIMARY KEY ("optr_id"); -CREATE UNIQUE INDEX "inx_frame_optr_login_name" ON "hme_frame_optr" USING btree ( - "login_name" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST +CREATE UNIQUE INDEX "inx_frame_optr_login_name" ON "hme_frame_optr" USING btree ( + "login_name" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST ); ALTER TABLE "hme_frame_optr_log" ADD CONSTRAINT "hme_frame_optr_log_pkey" PRIMARY KEY ("log_id"); ALTER TABLE "hme_frame_optr_login" ADD CONSTRAINT "hme_frame_optr_login_pkey" PRIMARY KEY ("log_id"); @@ -1207,8 +1207,8 @@ ALTER TABLE "hme_frame_res" ADD CONSTRAINT "hme_frame_res_pkey" PRIMARY KEY ("re ALTER TABLE "hme_frame_role" ADD CONSTRAINT "hme_frame_role_pkey" PRIMARY KEY ("role_id"); ALTER TABLE "hme_frame_role_res" ADD CONSTRAINT "hme_frame_role_res_pkey" PRIMARY KEY ("role_id", "res_id"); ALTER TABLE "sample_dataset" ADD CONSTRAINT "sample_dataset_pkey" PRIMARY KEY ("tsy_id"); -CREATE INDEX "pk_sample_dataset" ON "sample_dataset" USING btree ( - "dataset_name" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST +CREATE INDEX "pk_sample_dataset" ON "sample_dataset" USING btree ( + "dataset_name" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST ); ALTER TABLE "sample_dataset_track" ADD CONSTRAINT "sample_dataset_track_pkey" PRIMARY KEY ("tsy_id"); ALTER TABLE "sample_line" ADD CONSTRAINT "sample_line_pkey" PRIMARY KEY ("tsy_id"); @@ -1219,91 +1219,91 @@ ALTER TABLE "voyage_log" ADD CONSTRAINT "voyage_log_pkey" PRIMARY KEY ("tsy_id") ALTER TABLE "voyage_member" ADD CONSTRAINT "voyage_member_pkey" PRIMARY KEY ("tsy_id"); ALTER TABLE "voyage_navigation" ADD CONSTRAINT "voyage_navigation_pkey" PRIMARY KEY ("tsy_id"); ALTER TABLE "voyage_reg" ADD CONSTRAINT "voyage_reg_pkey" PRIMARY KEY ("tsy_id"); -CREATE UNIQUE INDEX "pk_voyage_reg" ON "voyage_reg" USING btree ( - "voyage_name" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST +CREATE UNIQUE INDEX "pk_voyage_reg" ON "voyage_reg" USING btree ( + "voyage_name" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST ); ALTER TABLE "voyage_reg_optr" ADD CONSTRAINT "VOYAGE_REG_OPTR_pkey" PRIMARY KEY ("tsy_id"); -ALTER SEQUENCE "VOYAGE_REG_OPTR_TSY_ID_seq" +ALTER SEQUENCE "VOYAGE_REG_OPTR_TSY_ID_seq" OWNED BY "voyage_reg_optr"."tsy_id"; SELECT setval('"VOYAGE_REG_OPTR_TSY_ID_seq"', 29, true); ALTER SEQUENCE "VOYAGE_REG_OPTR_TSY_ID_seq" OWNER TO "postgres"; -ALTER SEQUENCE "dict_data_tsy_id_seq" +ALTER SEQUENCE "dict_data_tsy_id_seq" OWNED BY "dict_data"."tsy_id"; SELECT setval('"dict_data_tsy_id_seq"', 148, true); ALTER SEQUENCE "dict_data_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "dict_equipment_tsy_id_seq" +ALTER SEQUENCE "dict_equipment_tsy_id_seq" OWNED BY "dict_equipment"."tsy_id"; SELECT setval('"dict_equipment_tsy_id_seq"', 165, true); ALTER SEQUENCE "dict_equipment_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "dict_funding_tsy_id_seq" +ALTER SEQUENCE "dict_funding_tsy_id_seq" OWNED BY "dict_funding"."tsy_id"; SELECT setval('"dict_funding_tsy_id_seq"', 12, true); ALTER SEQUENCE "dict_funding_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "dict_geom_tsy_id_seq" +ALTER SEQUENCE "dict_geom_tsy_id_seq" OWNED BY "dict_geom"."tsy_id"; SELECT setval('"dict_geom_tsy_id_seq"', 60, true); ALTER SEQUENCE "dict_geom_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "dict_platform_copy1_tsy_id_seq" +ALTER SEQUENCE "dict_platform_copy1_tsy_id_seq" OWNED BY "dict_report"."tsy_id"; SELECT setval('"dict_platform_copy1_tsy_id_seq"', 2, true); ALTER SEQUENCE "dict_platform_copy1_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "dict_platform_tsy_id_seq" +ALTER SEQUENCE "dict_platform_tsy_id_seq" OWNED BY "dict_platform"."tsy_id"; SELECT setval('"dict_platform_tsy_id_seq"', 19, true); ALTER SEQUENCE "dict_platform_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "dict_unit_sail_tsy_id_seq" +ALTER SEQUENCE "dict_unit_sail_tsy_id_seq" OWNED BY "dict_unit_sail"."tsy_id"; SELECT setval('"dict_unit_sail_tsy_id_seq"', 95, true); ALTER SEQUENCE "dict_unit_sail_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "dict_unit_share_tsy_id_seq" +ALTER SEQUENCE "dict_unit_share_tsy_id_seq" OWNED BY "dict_unit_share"."tsy_id"; SELECT setval('"dict_unit_share_tsy_id_seq"', 2, true); ALTER SEQUENCE "dict_unit_share_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "hme_frame_dept_dept_id_seq" +ALTER SEQUENCE "hme_frame_dept_dept_id_seq" OWNED BY "hme_frame_dept"."dept_id"; SELECT setval('"hme_frame_dept_dept_id_seq"', 2, false); ALTER SEQUENCE "hme_frame_dept_dept_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "hme_frame_optr_optr_id_seq" +ALTER SEQUENCE "hme_frame_optr_optr_id_seq" OWNED BY "hme_frame_optr"."optr_id"; SELECT setval('"hme_frame_optr_optr_id_seq"', 6, true); ALTER SEQUENCE "hme_frame_optr_optr_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "hme_frame_role_role_id_seq" +ALTER SEQUENCE "hme_frame_role_role_id_seq" OWNED BY "hme_frame_role"."role_id"; SELECT setval('"hme_frame_role_role_id_seq"', 2, false); ALTER SEQUENCE "hme_frame_role_role_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "sample_dataset_tsy_id_seq" +ALTER SEQUENCE "sample_dataset_tsy_id_seq" OWNED BY "sample_dataset"."tsy_id"; SELECT setval('"sample_dataset_tsy_id_seq"', 286, true); ALTER SEQUENCE "sample_dataset_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "sample_line_track_tsy_id_seq" +ALTER SEQUENCE "sample_line_track_tsy_id_seq" OWNED BY "sample_line_track"."tsy_id"; SELECT setval('"sample_line_track_tsy_id_seq"', 31, true); ALTER SEQUENCE "sample_line_track_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "sample_line_tsy_id_seq" +ALTER SEQUENCE "sample_line_tsy_id_seq" OWNED BY "sample_line"."tsy_id"; SELECT setval('"sample_line_tsy_id_seq"', 459, true); ALTER SEQUENCE "sample_line_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "sample_station_track_tsy_id_seq" +ALTER SEQUENCE "sample_station_track_tsy_id_seq" OWNED BY "sample_station_track"."tsy_id"; SELECT setval('"sample_station_track_tsy_id_seq"', 2494, true); ALTER SEQUENCE "sample_station_track_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "sample_station_tsy_id_seq" +ALTER SEQUENCE "sample_station_tsy_id_seq" OWNED BY "sample_station"."tsy_id"; SELECT setval('"sample_station_tsy_id_seq"', 4035, true); ALTER SEQUENCE "sample_station_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "voyage_log_tsy_id_seq" +ALTER SEQUENCE "voyage_log_tsy_id_seq" OWNED BY "voyage_log"."tsy_id"; SELECT setval('"voyage_log_tsy_id_seq"', 72, true); ALTER SEQUENCE "voyage_log_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "voyage_member_tsy_id_seq" +ALTER SEQUENCE "voyage_member_tsy_id_seq" OWNED BY "voyage_member"."tsy_id"; SELECT setval('"voyage_member_tsy_id_seq"', 1413, true); ALTER SEQUENCE "voyage_member_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "voyage_navigation_tsy_id_seq" +ALTER SEQUENCE "voyage_navigation_tsy_id_seq" OWNED BY "voyage_navigation"."tsy_id"; SELECT setval('"voyage_navigation_tsy_id_seq"', 381434, true); ALTER SEQUENCE "voyage_navigation_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "voyage_reg_tsy_id_seq" +ALTER SEQUENCE "voyage_reg_tsy_id_seq" OWNED BY "voyage_reg"."tsy_id"; SELECT setval('"voyage_reg_tsy_id_seq"', 25, true); ALTER SEQUENCE "voyage_reg_tsy_id_seq" OWNER TO "postgres"; diff --git a/src/main/data/readme.txt b/src/main/data/readme.txt index 07d7a72..6427080 100644 --- a/src/main/data/readme.txt +++ b/src/main/data/readme.txt @@ -1,31 +1,31 @@ -1.数据库更新至20251026，包含之前所输入信息，以此数据为基础版本 -增加表 -dict_geom： -geom_type字段：voyage表示航次，diving表示潜次 -geom_sn：表示航次号或者潜次号 -geom_value：geoserver能直接用的sql语句 -geom_name:预留给geoserver回写 -geom_level:预留给geoserver回写 - -2025-10-31更新 -更新自动增长序列 -SELECT setval('dict_data_tsy_id_seq',(SELECT max(tsy_id) FROM dict_data)); -SELECT setval('dict_equipment_tsy_id_seq',(SELECT max(tsy_id) FROM dict_equipment)); -SELECT setval('dict_funding_tsy_id_seq',(SELECT max(tsy_id) FROM dict_funding)); -SELECT setval('dict_geom_tsy_id_seq',(SELECT max(tsy_id) FROM dict_geom)); -SELECT setval('dict_platform_copy1_tsy_id_seq',(SELECT max(tsy_id) FROM dict_report)); -SELECT setval('dict_platform_tsy_id_seq',(SELECT max(tsy_id) FROM dict_platform)); -SELECT setval('dict_unit_sail_tsy_id_seq',(SELECT max(tsy_id) FROM dict_unit_sail)); -SELECT setval('dict_unit_share_tsy_id_seq',(SELECT max(tsy_id) FROM dict_unit_share)); -SELECT setval('hme_frame_dept_dept_id_seq',(SELECT max(dept_id) FROM hme_frame_dept)); -SELECT setval('hme_frame_optr_optr_id_seq',(SELECT max(optr_id) FROM hme_frame_optr)); -SELECT setval('hme_frame_role_role_id_seq',(SELECT max(role_id) FROM hme_frame_role)); -SELECT setval('sample_dataset_tsy_id_seq',(SELECT max(tsy_id) FROM sample_dataset)); -SELECT setval('sample_line_track_tsy_id_seq',(SELECT max(tsy_id) FROM sample_line_track)); -SELECT setval('sample_line_tsy_id_seq',(SELECT max(tsy_id) FROM sample_line)); -SELECT setval('sample_station_track_tsy_id_seq',(SELECT max(tsy_id) FROM sample_station_track)); -SELECT setval('sample_station_tsy_id_seq',(SELECT max(tsy_id) FROM sample_station)); -SELECT setval('voyage_log_tsy_id_seq',(SELECT max(tsy_id) FROM voyage_log)); -SELECT setval('voyage_member_tsy_id_seq',(SELECT max(tsy_id) FROM voyage_member)); -SELECT setval('voyage_navigation_tsy_id_seq',(SELECT max(tsy_id) FROM voyage_navigation)); +1.数据库更新至20251026，包含之前所输入信息，以此数据为基础版本 +增加表 +dict_geom： +geom_type字段：voyage表示航次，diving表示潜次 +geom_sn：表示航次号或者潜次号 +geom_value：geoserver能直接用的sql语句 +geom_name:预留给geoserver回写 +geom_level:预留给geoserver回写 + +2025-10-31更新 +更新自动增长序列 +SELECT setval('dict_data_tsy_id_seq',(SELECT max(tsy_id) FROM dict_data)); +SELECT setval('dict_equipment_tsy_id_seq',(SELECT max(tsy_id) FROM dict_equipment)); +SELECT setval('dict_funding_tsy_id_seq',(SELECT max(tsy_id) FROM dict_funding)); +SELECT setval('dict_geom_tsy_id_seq',(SELECT max(tsy_id) FROM dict_geom)); +SELECT setval('dict_platform_copy1_tsy_id_seq',(SELECT max(tsy_id) FROM dict_report)); +SELECT setval('dict_platform_tsy_id_seq',(SELECT max(tsy_id) FROM dict_platform)); +SELECT setval('dict_unit_sail_tsy_id_seq',(SELECT max(tsy_id) FROM dict_unit_sail)); +SELECT setval('dict_unit_share_tsy_id_seq',(SELECT max(tsy_id) FROM dict_unit_share)); +SELECT setval('hme_frame_dept_dept_id_seq',(SELECT max(dept_id) FROM hme_frame_dept)); +SELECT setval('hme_frame_optr_optr_id_seq',(SELECT max(optr_id) FROM hme_frame_optr)); +SELECT setval('hme_frame_role_role_id_seq',(SELECT max(role_id) FROM hme_frame_role)); +SELECT setval('sample_dataset_tsy_id_seq',(SELECT max(tsy_id) FROM sample_dataset)); +SELECT setval('sample_line_track_tsy_id_seq',(SELECT max(tsy_id) FROM sample_line_track)); +SELECT setval('sample_line_tsy_id_seq',(SELECT max(tsy_id) FROM sample_line)); +SELECT setval('sample_station_track_tsy_id_seq',(SELECT max(tsy_id) FROM sample_station_track)); +SELECT setval('sample_station_tsy_id_seq',(SELECT max(tsy_id) FROM sample_station)); +SELECT setval('voyage_log_tsy_id_seq',(SELECT max(tsy_id) FROM voyage_log)); +SELECT setval('voyage_member_tsy_id_seq',(SELECT max(tsy_id) FROM voyage_member)); +SELECT setval('voyage_navigation_tsy_id_seq',(SELECT max(tsy_id) FROM voyage_navigation)); SELECT setval('voyage_reg_tsy_id_seq',(SELECT max(tsy_id) FROM voyage_reg)); \ No newline at end of file diff --git a/src/main/java/app.properties b/src/main/java/app.properties index 9971273..1ad8ea2 100644 --- a/src/main/java/app.properties +++ b/src/main/java/app.properties @@ -1,5 +1,5 @@ -AppDebug=true -AppTrace=true -AppParamHelper=cn.tsy.cas.idsse.dsds.helper.DsdsParamHelper -AppListener=cn.tsy.cas.idsse.dsds.control.DSDSInitializeListener +AppDebug=true +AppTrace=true +AppParamHelper=cn.tsy.cas.idsse.dsds.helper.DSDSParamHelper +AppListener=cn.tsy.cas.idsse.dsds.control.DSDSInitializeListener AppName=DSDSServer \ No newline at end of file diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/constant/VoyageJobType.java b/src/main/java/cn/tsy/cas/idsse/dsds/constant/VoyageJobType.java index b2d1f5b..a2f44d0 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/constant/VoyageJobType.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/constant/VoyageJobType.java @@ -1,23 +1,23 @@ -package cn.tsy.cas.idsse.dsds.constant; - -/*********************** - * 航次作业类型 - * @author TsySoft - * @create 2024-05-14 10:08:05 - * @version 1.0.0 - * @email revisit@126.com - * - */ -public class VoyageJobType { - - /******************* - * 测线作业 - */ - public static final String Line = "测线作业"; - /******************* - * 站位作业 - */ - public static final String Station = "站位作业"; - - -} +package cn.tsy.cas.idsse.dsds.constant; + +/*********************** + * 航次作业类型 + * @author TsySoft + * @create 2024-05-14 10:08:05 + * @version 1.0.0 + * @email revisit@126.com + * + */ +public class VoyageJobType { + + /******************* + * 测线作业 + */ + public static final String Line = "测线作业"; + /******************* + * 站位作业 + */ + public static final String Station = "站位作业"; + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/constant/VoyageLogType.java b/src/main/java/cn/tsy/cas/idsse/dsds/constant/VoyageLogType.java index 94933dd..7da1dc6 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/constant/VoyageLogType.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/constant/VoyageLogType.java @@ -1,27 +1,27 @@ -package cn.tsy.cas.idsse.dsds.constant; - -/*********************** - * 航次日志类型 - * @author TsySoft - * @create 2024-05-14 10:08:05 - * @version 1.0.0 - * @email revisit@126.com - * - */ -public class VoyageLogType { - - /******************* - * 建立航次 - */ - public static final String Create = "Create"; - /******************* - * 导入导航文件 - */ - public static final String UploadNavigation = "UploadNavigation"; - /******************* - * 导入参航人员 - */ - public static final String UploadMember = "UploadMebmer"; - - -} +package cn.tsy.cas.idsse.dsds.constant; + +/*********************** + * 航次日志类型 + * @author TsySoft + * @create 2024-05-14 10:08:05 + * @version 1.0.0 + * @email revisit@126.com + * + */ +public class VoyageLogType { + + /******************* + * 建立航次 + */ + public static final String Create = "Create"; + /******************* + * 导入导航文件 + */ + public static final String UploadNavigation = "UploadNavigation"; + /******************* + * 导入参航人员 + */ + public static final String UploadMember = "UploadMebmer"; + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/constant/VoyageStatus.java b/src/main/java/cn/tsy/cas/idsse/dsds/constant/VoyageStatus.java index 5a33e49..4f8a406 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/constant/VoyageStatus.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/constant/VoyageStatus.java @@ -1,17 +1,17 @@ -package cn.tsy.cas.idsse.dsds.constant; - -/*********************** - * 航次日志类型 - * @author TsySoft - * @create 2024-05-14 10:08:05 - * @version 1.0.0 - * @email revisit@126.com - * - */ -public class VoyageStatus { - - /******************* - * 计划 - */ - public static final String Plan = "Plan"; -} +package cn.tsy.cas.idsse.dsds.constant; + +/*********************** + * 航次日志类型 + * @author TsySoft + * @create 2024-05-14 10:08:05 + * @version 1.0.0 + * @email revisit@126.com + * + */ +public class VoyageStatus { + + /******************* + * 计划 + */ + public static final String Plan = "Plan"; +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/DSDSControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/DSDSControl.java index 5b989a8..aef6a00 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/DSDSControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/DSDSControl.java @@ -1,7 +1,7 @@ -package cn.tsy.cas.idsse.dsds.control; - -import cn.hme.framework.frame.control.HmeFrameControl; - -public class DSDSControl extends HmeFrameControl{ - -} +package cn.tsy.cas.idsse.dsds.control; + +import cn.hme.framework.frame.control.HmeFrameControl; + +public class DSDSControl extends HmeFrameControl{ + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/DSDSInitializeListener.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/DSDSInitializeListener.java index 8cf8d28..33f6f56 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/DSDSInitializeListener.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/DSDSInitializeListener.java @@ -1,21 +1,21 @@ -package cn.tsy.cas.idsse.dsds.control; - -import cn.hme.framework.core.HmeAppParamerter; -import cn.tsy.cas.idsse.dsds.thread.DSDSReportThread; -import jakarta.servlet.ServletContextEvent; -import jakarta.servlet.ServletContextListener; - -public class DSDSInitializeListener implements ServletContextListener { - @Override - public void contextInitialized(ServletContextEvent sc) { - if (HmeAppParamerter.AppName.equals("DSDSServer")) { - new Thread(new DSDSReportThread()).start(); - } - - - } - - @Override - public void contextDestroyed(ServletContextEvent sc) { - } -} +package cn.tsy.cas.idsse.dsds.control; + +import cn.hme.framework.core.HmeAppParamerter; +import cn.tsy.cas.idsse.dsds.thread.DSDSReportThread; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; + +public class DSDSInitializeListener implements ServletContextListener { + @Override + public void contextInitialized(ServletContextEvent sc) { + if (HmeAppParamerter.AppName.equals("DSDSServer")) { + new Thread(new DSDSReportThread()).start(); + } + + + } + + @Override + public void contextDestroyed(ServletContextEvent sc) { + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/api/DSDSApiVoyageControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/api/DSDSApiVoyageControl.java index 5c8fd27..267353d 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/api/DSDSApiVoyageControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/api/DSDSApiVoyageControl.java @@ -1,42 +1,42 @@ -package cn.tsy.cas.idsse.dsds.control.api; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; - -@RestController -@CrossOrigin -@RequestMapping("api/voyage") -public class DSDSApiVoyageControl { - - @Autowired - private IVoyageRegMapper iVoayge; - - @RequestMapping("list.htm") - public HmeAjax list() { - String sql = "select sd.voyage_id,r.voyage_name,r.ship_name,line.dataset_id,line.dataset_name,line.conver_area,line.tsy_id sample_id,line.sample_name,r.voyage_mileage,diving_sn,voyage_days " - + "from voyage_reg r,sample_dataset sd,sample_line line where r.tsy_id=sd.voyage_id and sd.tsy_id=line.dataset_id and sample_tag_name='应急搜捞' order by line.dataset_name"; - List> array = this.iVoayge.mapBySql(sql); - Map>> mapReturn = new HashMap<>(); - List> arrayReturn = new ArrayList<>(); - for(Map map:array) { - String voyage_name = map.get("voyage_name").toString(); - if(!mapReturn.containsKey(voyage_name)) { - arrayReturn.add(map); - mapReturn.put(voyage_name, new ArrayList<>()); - } - mapReturn.get(voyage_name).add(map); - } - mapReturn.put("VoyageArray", arrayReturn); - return new HmeAjax(mapReturn); - } -} +package cn.tsy.cas.idsse.dsds.control.api; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; + +@RestController +@CrossOrigin +@RequestMapping("api/voyage") +public class DSDSApiVoyageControl { + + @Autowired + private IVoyageRegMapper iVoayge; + + @RequestMapping("list.htm") + public HmeAjax list() { + String sql = "select sd.voyage_id,r.voyage_name,r.ship_name,line.dataset_id,line.dataset_name,line.conver_area,line.tsy_id sample_id,line.sample_name,r.voyage_mileage,diving_sn,voyage_days " + + "from voyage_reg r,sample_dataset sd,sample_line line where r.tsy_id=sd.voyage_id and sd.tsy_id=line.dataset_id and sample_tag_name='应急搜捞' order by line.dataset_name"; + List> array = this.iVoayge.mapBySql(sql); + Map>> mapReturn = new HashMap<>(); + List> arrayReturn = new ArrayList<>(); + for(Map map:array) { + String voyage_name = map.get("voyage_name").toString(); + if(!mapReturn.containsKey(voyage_name)) { + arrayReturn.add(map); + mapReturn.put(voyage_name, new ArrayList<>()); + } + mapReturn.get(voyage_name).add(map); + } + mapReturn.put("VoyageArray", arrayReturn); + return new HmeAjax(mapReturn); + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictDataControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictDataControl.java index 4fc2000..04092ae 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictDataControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictDataControl.java @@ -1,55 +1,55 @@ -package cn.tsy.cas.idsse.dsds.control.dict; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.jdbc.entity.OrderBy; -import cn.hme.framework.jdbc.entity.OrderByType; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.cas.idsse.dsds.service.dict.DictDataService; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictDataMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictData; - -@RestController -@RequestMapping("dict/data") -public class DictDataControl extends HmeAjaxControl { - - @Autowired - private IDictDataMapper mData; - - @Autowired - private DictDataService sData; - - @RequestMapping("page.htm") - public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { - order = HmeStringHelper.hasValue(order) ? order : "data_order"; - type = HmeStringHelper.hasValue(type) ? type : "DESC"; - Pageable page = this.mData.dataWithPage(group, start, limit, query, order, type); - return new HmeAjax(page); - } - - @RequestMapping("all.htm") - public HmeAjax all() { - return new HmeAjax(this.mData.allByOrder(OrderBy.of("data_order", OrderByType.DESC))); - } - - @RequestMapping("edit.htm") - public HmeAjax edit(DictData data) { - DSDSWebHelper.getFrameOptr(true); - this.sData.editData(data); - return new HmeAjax(data); - } - - @RequestMapping("delete.htm") - public HmeAjax delete(int tsy_id) { - DSDSWebHelper.getFrameOptr(true); - this.sData.deleteData(tsy_id); - return new HmeAjax(); - } - -} +package cn.tsy.cas.idsse.dsds.control.dict; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.jdbc.entity.OrderBy; +import cn.hme.framework.jdbc.entity.OrderByType; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.cas.idsse.dsds.service.dict.DictDataService; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictDataMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictData; + +@RestController +@RequestMapping("dict/data") +public class DictDataControl extends HmeAjaxControl { + + @Autowired + private IDictDataMapper mData; + + @Autowired + private DictDataService sData; + + @RequestMapping("page.htm") + public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { + order = HmeStringHelper.hasValue(order) ? order : "data_order"; + type = HmeStringHelper.hasValue(type) ? type : "DESC"; + Pageable page = this.mData.dataWithPage(group, start, limit, query, order, type); + return new HmeAjax(page); + } + + @RequestMapping("all.htm") + public HmeAjax all() { + return new HmeAjax(this.mData.allByOrder(OrderBy.of("data_order", OrderByType.DESC))); + } + + @RequestMapping("edit.htm") + public HmeAjax edit(DictData data) { + DSDSWebHelper.getFrameOptr(true); + this.sData.editData(data); + return new HmeAjax(data); + } + + @RequestMapping("delete.htm") + public HmeAjax delete(int tsy_id) { + DSDSWebHelper.getFrameOptr(true); + this.sData.deleteData(tsy_id); + return new HmeAjax(); + } + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictEquipmentControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictEquipmentControl.java index b89427a..209a57e 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictEquipmentControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictEquipmentControl.java @@ -1,57 +1,57 @@ -package cn.tsy.cas.idsse.dsds.control.dict; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.jdbc.entity.OrderBy; -import cn.hme.framework.jdbc.entity.OrderByType; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.cas.idsse.dsds.service.dict.DictEquipmentService; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictEquipmentMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictEquipment; - -@RestController -@RequestMapping("dict/equipment") -public class DictEquipmentControl extends HmeAjaxControl{ - - @Autowired - private IDictEquipmentMapper mEquipment; - - @Autowired - private DictEquipmentService sEquipment; - - @RequestMapping("page.htm") - public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { - order = HmeStringHelper.hasValue(order) ? order : "equipment_order"; - type = HmeStringHelper.hasValue(type) ? type : "DESC"; - Pageable page = this.mEquipment.equipmentWithPage(group, start, limit, query, order, type); - return new HmeAjax(page); - } - @RequestMapping("all.htm") - public HmeAjax all() { - return new HmeAjax(this.mEquipment.allByOrder(OrderBy.of("equipment_order",OrderByType.DESC))); - } - - @RequestMapping("edit.htm") - public HmeAjax edit(DictEquipment equipment) { - DSDSWebHelper.getFrameOptr(true); - this.sEquipment.editEquipment(equipment); - return new HmeAjax(equipment); - } - - @RequestMapping("delete.htm") - public HmeAjax delete(int tsy_id) { - DSDSWebHelper.getFrameOptr(true); - this.sEquipment.deleteEquipment(tsy_id); - return new HmeAjax(); - } - - - - -} +package cn.tsy.cas.idsse.dsds.control.dict; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.jdbc.entity.OrderBy; +import cn.hme.framework.jdbc.entity.OrderByType; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.cas.idsse.dsds.service.dict.DictEquipmentService; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictEquipmentMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictEquipment; + +@RestController +@RequestMapping("dict/equipment") +public class DictEquipmentControl extends HmeAjaxControl{ + + @Autowired + private IDictEquipmentMapper mEquipment; + + @Autowired + private DictEquipmentService sEquipment; + + @RequestMapping("page.htm") + public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { + order = HmeStringHelper.hasValue(order) ? order : "equipment_order"; + type = HmeStringHelper.hasValue(type) ? type : "DESC"; + Pageable page = this.mEquipment.equipmentWithPage(group, start, limit, query, order, type); + return new HmeAjax(page); + } + @RequestMapping("all.htm") + public HmeAjax all() { + return new HmeAjax(this.mEquipment.allByOrder(OrderBy.of("equipment_order",OrderByType.DESC))); + } + + @RequestMapping("edit.htm") + public HmeAjax edit(DictEquipment equipment) { + DSDSWebHelper.getFrameOptr(true); + this.sEquipment.editEquipment(equipment); + return new HmeAjax(equipment); + } + + @RequestMapping("delete.htm") + public HmeAjax delete(int tsy_id) { + DSDSWebHelper.getFrameOptr(true); + this.sEquipment.deleteEquipment(tsy_id); + return new HmeAjax(); + } + + + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictFundingControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictFundingControl.java index 06a9a6f..1f23a82 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictFundingControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictFundingControl.java @@ -1,57 +1,57 @@ -package cn.tsy.cas.idsse.dsds.control.dict; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.jdbc.entity.OrderBy; -import cn.hme.framework.jdbc.entity.OrderByType; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.cas.idsse.dsds.service.dict.DictFundingService; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictFundingMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictFunding; - -@RestController -@RequestMapping("dict/funding") -public class DictFundingControl extends HmeAjaxControl{ - - @Autowired - private IDictFundingMapper mFunding; - - @Autowired - private DictFundingService sFunding; - - @RequestMapping("page.htm") - public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { - order = HmeStringHelper.hasValue(order) ? order : "funding_order"; - type = HmeStringHelper.hasValue(type) ? type : "DESC"; - Pageable page = this.mFunding.fundingWithPage(group, start, limit, query, order, type); - return new HmeAjax(page); - } - @RequestMapping("all.htm") - public HmeAjax all() { - return new HmeAjax(this.mFunding.allByOrder(OrderBy.of("funding_order",OrderByType.DESC))); - } - - @RequestMapping("edit.htm") - public HmeAjax edit(DictFunding funding) { - DSDSWebHelper.getFrameOptr(true); - this.sFunding.editFunding(funding); - return new HmeAjax(funding); - } - - @RequestMapping("delete.htm") - public HmeAjax delete(int tsy_id) { - DSDSWebHelper.getFrameOptr(true); - this.sFunding.deleteFunding(tsy_id); - return new HmeAjax(); - } - - - - -} +package cn.tsy.cas.idsse.dsds.control.dict; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.jdbc.entity.OrderBy; +import cn.hme.framework.jdbc.entity.OrderByType; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.cas.idsse.dsds.service.dict.DictFundingService; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictFundingMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictFunding; + +@RestController +@RequestMapping("dict/funding") +public class DictFundingControl extends HmeAjaxControl{ + + @Autowired + private IDictFundingMapper mFunding; + + @Autowired + private DictFundingService sFunding; + + @RequestMapping("page.htm") + public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { + order = HmeStringHelper.hasValue(order) ? order : "funding_order"; + type = HmeStringHelper.hasValue(type) ? type : "DESC"; + Pageable page = this.mFunding.fundingWithPage(group, start, limit, query, order, type); + return new HmeAjax(page); + } + @RequestMapping("all.htm") + public HmeAjax all() { + return new HmeAjax(this.mFunding.allByOrder(OrderBy.of("funding_order",OrderByType.DESC))); + } + + @RequestMapping("edit.htm") + public HmeAjax edit(DictFunding funding) { + DSDSWebHelper.getFrameOptr(true); + this.sFunding.editFunding(funding); + return new HmeAjax(funding); + } + + @RequestMapping("delete.htm") + public HmeAjax delete(int tsy_id) { + DSDSWebHelper.getFrameOptr(true); + this.sFunding.deleteFunding(tsy_id); + return new HmeAjax(); + } + + + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictPlatformControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictPlatformControl.java index 69b66e5..528a24f 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictPlatformControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictPlatformControl.java @@ -1,63 +1,63 @@ -package cn.tsy.cas.idsse.dsds.control.dict; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.jdbc.entity.OrderBy; -import cn.hme.framework.jdbc.entity.OrderByType; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.cas.idsse.dsds.service.dict.DictPlatformService; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictPlatformMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictPlatform; - -@RestController -@RequestMapping("dict/platform") -public class DictPlatformControl extends HmeAjaxControl { - - @Autowired - private IDictPlatformMapper mPlatform; - - @Autowired - private DictPlatformService sPlatform; - - @RequestMapping("page.htm") - public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { - order = HmeStringHelper.hasValue(order) ? order : "platform_order"; - type = HmeStringHelper.hasValue(type) ? type : "DESC"; - Pageable page = this.mPlatform.platformWithPage(group, start, limit, query, order, type); - return new HmeAjax(page); - } - - @RequestMapping("all.htm") - public HmeAjax all() { - return new HmeAjax(this.mPlatform.allByOrder(OrderBy.of("platform_order",OrderByType.DESC))); - } - - @RequestMapping("edit.htm") - public HmeAjax edit(DictPlatform platform) { - DSDSWebHelper.getFrameOptr(true); - this.sPlatform.editPlatform(platform); - return new HmeAjax(platform); - } - - @RequestMapping("delete.htm") - public HmeAjax delete(int tsy_id) { - DSDSWebHelper.getFrameOptr(true); - this.sPlatform.deletePlatform(tsy_id); - return new HmeAjax(); - } - - - - - - - - - -} +package cn.tsy.cas.idsse.dsds.control.dict; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.jdbc.entity.OrderBy; +import cn.hme.framework.jdbc.entity.OrderByType; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.cas.idsse.dsds.service.dict.DictPlatformService; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictPlatformMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictPlatform; + +@RestController +@RequestMapping("dict/platform") +public class DictPlatformControl extends HmeAjaxControl { + + @Autowired + private IDictPlatformMapper mPlatform; + + @Autowired + private DictPlatformService sPlatform; + + @RequestMapping("page.htm") + public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { + order = HmeStringHelper.hasValue(order) ? order : "platform_order"; + type = HmeStringHelper.hasValue(type) ? type : "DESC"; + Pageable page = this.mPlatform.platformWithPage(group, start, limit, query, order, type); + return new HmeAjax(page); + } + + @RequestMapping("all.htm") + public HmeAjax all() { + return new HmeAjax(this.mPlatform.allByOrder(OrderBy.of("platform_order",OrderByType.DESC))); + } + + @RequestMapping("edit.htm") + public HmeAjax edit(DictPlatform platform) { + DSDSWebHelper.getFrameOptr(true); + this.sPlatform.editPlatform(platform); + return new HmeAjax(platform); + } + + @RequestMapping("delete.htm") + public HmeAjax delete(int tsy_id) { + DSDSWebHelper.getFrameOptr(true); + this.sPlatform.deletePlatform(tsy_id); + return new HmeAjax(); + } + + + + + + + + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictUnitSailControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictUnitSailControl.java index 953c56a..c8a327e 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictUnitSailControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictUnitSailControl.java @@ -1,48 +1,48 @@ -package cn.tsy.cas.idsse.dsds.control.dict; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.cas.idsse.dsds.service.dict.DictUnitSailService; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictUnitSailMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictUnitSail; - -@RestController -@RequestMapping("dict/unit/sail") -public class DictUnitSailControl extends HmeAjaxControl{ - - @Autowired - private IDictUnitSailMapper mUnitSail; - - @Autowired - private DictUnitSailService sUnitSail; - - @RequestMapping("page.htm") - public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { - order = HmeStringHelper.hasValue(order) ? order : "unit_name"; - Pageable page = this.mUnitSail.sailWithPage(group, start, limit, query, order, type); - return new HmeAjax(page); - } - - @RequestMapping("edit.htm") - public HmeAjax edit(DictUnitSail sail) { - DSDSWebHelper.getFrameOptr(true); - this.sUnitSail.editUnitSail(sail); - return new HmeAjax(sail); - } - - @RequestMapping("delete.htm") - public HmeAjax delete(int tsy_id) { - DSDSWebHelper.getFrameOptr(true); - this.sUnitSail.deleteUnitSail(tsy_id); - return new HmeAjax(); - } - - -} +package cn.tsy.cas.idsse.dsds.control.dict; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.cas.idsse.dsds.service.dict.DictUnitSailService; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictUnitSailMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictUnitSail; + +@RestController +@RequestMapping("dict/unit/sail") +public class DictUnitSailControl extends HmeAjaxControl{ + + @Autowired + private IDictUnitSailMapper mUnitSail; + + @Autowired + private DictUnitSailService sUnitSail; + + @RequestMapping("page.htm") + public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { + order = HmeStringHelper.hasValue(order) ? order : "unit_name"; + Pageable page = this.mUnitSail.sailWithPage(group, start, limit, query, order, type); + return new HmeAjax(page); + } + + @RequestMapping("edit.htm") + public HmeAjax edit(DictUnitSail sail) { + DSDSWebHelper.getFrameOptr(true); + this.sUnitSail.editUnitSail(sail); + return new HmeAjax(sail); + } + + @RequestMapping("delete.htm") + public HmeAjax delete(int tsy_id) { + DSDSWebHelper.getFrameOptr(true); + this.sUnitSail.deleteUnitSail(tsy_id); + return new HmeAjax(); + } + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictUnitShareControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictUnitShareControl.java index 544e4e7..a5bfde4 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictUnitShareControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/dict/DictUnitShareControl.java @@ -1,48 +1,48 @@ -package cn.tsy.cas.idsse.dsds.control.dict; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.cas.idsse.dsds.service.dict.DictUnitShareService; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictUnitShareMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictUnitShare; - -@RestController -@RequestMapping("dict/unit/share") -public class DictUnitShareControl extends HmeAjaxControl{ - - @Autowired - private IDictUnitShareMapper mUnitShare; - - @Autowired - private DictUnitShareService sUnitShare; - - @RequestMapping("page.htm") - public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { - order = HmeStringHelper.hasValue(order) ? order : "unit_name"; - Pageable page = this.mUnitShare.shareWithPage(group, start, limit, query, order, type); - return new HmeAjax(page); - } - - @RequestMapping("edit.htm") - public HmeAjax edit(DictUnitShare sail) { - DSDSWebHelper.getFrameOptr(true); - this.sUnitShare.editUnitShare(sail); - return new HmeAjax(sail); - } - - @RequestMapping("delete.htm") - public HmeAjax delete(int tsy_id) { - DSDSWebHelper.getFrameOptr(true); - this.sUnitShare.deleteUnitShare(tsy_id); - return new HmeAjax(); - } - - -} +package cn.tsy.cas.idsse.dsds.control.dict; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.cas.idsse.dsds.service.dict.DictUnitShareService; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictUnitShareMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictUnitShare; + +@RestController +@RequestMapping("dict/unit/share") +public class DictUnitShareControl extends HmeAjaxControl{ + + @Autowired + private IDictUnitShareMapper mUnitShare; + + @Autowired + private DictUnitShareService sUnitShare; + + @RequestMapping("page.htm") + public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { + order = HmeStringHelper.hasValue(order) ? order : "unit_name"; + Pageable page = this.mUnitShare.shareWithPage(group, start, limit, query, order, type); + return new HmeAjax(page); + } + + @RequestMapping("edit.htm") + public HmeAjax edit(DictUnitShare sail) { + DSDSWebHelper.getFrameOptr(true); + this.sUnitShare.editUnitShare(sail); + return new HmeAjax(sail); + } + + @RequestMapping("delete.htm") + public HmeAjax delete(int tsy_id) { + DSDSWebHelper.getFrameOptr(true); + this.sUnitShare.deleteUnitShare(tsy_id); + return new HmeAjax(); + } + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/login/DSDSLoginControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/login/DSDSLoginControl.java index 56624e7..838c7ae 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/login/DSDSLoginControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/login/DSDSLoginControl.java @@ -1,35 +1,35 @@ -package cn.tsy.cas.idsse.dsds.control.login; - -import java.time.LocalDateTime; -import java.util.HashMap; -import java.util.Map; - -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.frame.control.dict.HmeFrameDictHelper; -import cn.hme.framework.frame.control.param.HmeFrameParamHelper; - - - -@RestController -@CrossOrigin -@RequestMapping("login") -public class DSDSLoginControl extends HmeAjaxControl { - @RequestMapping("init.htm") - public HmeAjax init() { - Map map = new HashMap(); - // 字典信息 - map.put("FrameDictArray", HmeFrameDictHelper.create().getArrayDict()); - // 服务器时间 - map.put("FrameCurrentTime", LocalDateTime.now()); - // 系统所有参数 - map.put("FrameParamArray", HmeFrameParamHelper.create().getParam()); - - - return new HmeAjax(map); - } -} +package cn.tsy.cas.idsse.dsds.control.login; + +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.Map; + +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.frame.control.dict.HmeFrameDictHelper; +import cn.hme.framework.frame.control.param.HmeFrameParamHelper; + + + +@RestController +@CrossOrigin +@RequestMapping("login") +public class DSDSLoginControl extends HmeAjaxControl { + @RequestMapping("init.htm") + public HmeAjax init() { + Map map = new HashMap(); + // 字典信息 + map.put("FrameDictArray", HmeFrameDictHelper.create().getArrayDict()); + // 服务器时间 + map.put("FrameCurrentTime", LocalDateTime.now()); + // 系统所有参数 + map.put("FrameParamArray", HmeFrameParamHelper.create().getParam()); + + + return new HmeAjax(map); + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/param/DSDSParamControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/param/DSDSParamControl.java index 938f20d..d055d0f 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/param/DSDSParamControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/param/DSDSParamControl.java @@ -1,22 +1,22 @@ -package cn.tsy.cas.idsse.dsds.control.param; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.data.frame.mapper.IHmeFrameParamMapper; -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; - - -@RestController -@RequestMapping("param") -public class DSDSParamControl extends HmeAjaxControl{ - - @Autowired - private IHmeFrameParamMapper mParam; - @RequestMapping("list.htm") - public HmeAjax list() { - return new HmeAjax(this.mParam.all()); - } -} +package cn.tsy.cas.idsse.dsds.control.param; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.data.frame.mapper.IHmeFrameParamMapper; +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; + + +@RestController +@RequestMapping("param") +public class DSDSParamControl extends HmeAjaxControl{ + + @Autowired + private IHmeFrameParamMapper mParam; + @RequestMapping("list.htm") + public HmeAjax list() { + return new HmeAjax(this.mParam.all()); + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/report/DSDSReportControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/report/DSDSReportControl.java index ab15a43..02c3ecc 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/report/DSDSReportControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/report/DSDSReportControl.java @@ -1,178 +1,178 @@ -package cn.tsy.cas.idsse.dsds.control.report; - -import java.time.LocalDate; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.jdbc.entity.SqlConditionType; -import cn.hme.framework.jdbc.entity.SqlQuery; -import cn.tsy.cas.idsse.dsds.thread.DSDSReportThread; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictReportMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegReportMapper; - -@RestController -@RequestMapping("report") -public class DSDSReportControl extends HmeAjaxControl { - @Autowired - private IVoyageRegMapper iReg; - @Autowired - private IVoyageRegReportMapper iRegReport; - @Autowired - private IDictReportMapper iReport; - - @RequestMapping("main.htm") - public HmeAjax list() { - return new HmeAjax(DSDSReportThread.map); - } - - /******************* - * 返回所有配置的前端报表需要的排序 - */ - @RequestMapping("type/list.htm") - public HmeAjax listType() { - return new HmeAjax(iReport.listByColumn("report_status", "Active", "report_type", "report_order")); - } - - /*************** - * 科考船汇总统计属性 - */ - @RequestMapping("ship/total.htm") - public HmeAjax totalShip(String ship_name, LocalDate start, LocalDate end,Integer year) { - return new HmeAjax(this.iRegReport.reportShipTotal(ship_name, start, end,year)); - } - - /*************** - * 科考船航次 - */ - @RequestMapping("ship/voyage.htm") - public HmeAjax shipVoyage(String ship_name, LocalDate start, LocalDate end) { - SqlQuery query = SqlQuery.create().addOrder("voyage_start_date"); - if (HmeStringHelper.hasValue(ship_name)) - query.addCondition("ship_name", ship_name); - if (start != null) - query.addCondition("voyage_start_date", start, SqlConditionType.GTE); - if (end != null) - query.addCondition("voyage_start_date", end, SqlConditionType.LTE); - return new HmeAjax(this.iReg.list(query)); - } - - /*************** - * 参航单位地图 - */ - @RequestMapping("ship/unit.htm") - public HmeAjax shipUnit(String ship_name, LocalDate start, LocalDate end,Integer year) { - return new HmeAjax(this.iRegReport.reportShipUnit(ship_name, start, end,year)); - } - /*************** - * 参航单位地图 - */ - @RequestMapping("ship/unit/year.htm") - public HmeAjax shipUnitYear(String ship_name) { - return new HmeAjax(this.iRegReport.reportShipUnitWithYear(ship_name)); - } - - /*************** - * 载人潜水器 - */ - @RequestMapping("platform/hov.htm") - public HmeAjax platformHov(String platform_name, LocalDate start, LocalDate end,Integer year) { - return new HmeAjax(this.iRegReport.reportPlatformTotal("'载人潜水器'", platform_name, start, end,year)); - } - - /*************** - * 无人航行潜水器 - */ - @RequestMapping("platform/auv.htm") - public HmeAjax platformAuv(String platform_name, LocalDate start, LocalDate end,Integer year) { - return new HmeAjax(this.iRegReport.reportPlatformTotal("'水下自主式无人潜器'", platform_name, start, end,year)); - } - - /*************** - * 遥控潜水器 - */ - @RequestMapping("platform/rov.htm") - public HmeAjax platformRov(String platform_name, LocalDate start, LocalDate end,Integer year) { - return new HmeAjax(this.iRegReport.reportPlatformTotal("'遥控水下机器人'", platform_name, start, end,year)); - } - - /*************** - * 载人潜水器 - */ - @RequestMapping("platform/hov/unit.htm") - public HmeAjax platformHovUnit(String platform_name, LocalDate start, LocalDate end,Integer year) { - return new HmeAjax(this.iRegReport.reportPlatformUnit("'载人潜水器'", platform_name, start, end,year)); - } - - /*************** - * 无人航行潜水器 - */ - @RequestMapping("platform/auv/unit.htm") - public HmeAjax platformAuvUnit(String platform_name, LocalDate start, LocalDate end,Integer year) { - return new HmeAjax(this.iRegReport.reportPlatformUnit("'水下自主式无人潜器'", platform_name, start, end,year)); - } - - /*************** - * 遥控潜水器 - */ - @RequestMapping("platform/rov/unit.htm") - public HmeAjax platformRovUnit(String platform_name, LocalDate start, LocalDate end,Integer year) { - return new HmeAjax(this.iRegReport.reportPlatformUnit("'遥控水下机器人'", platform_name, start, end, year)); - } - - - /*************** - * 载人潜水器 - */ - @RequestMapping("platform/hov/unit/year.htm") - public HmeAjax platformHovUnitYear(String platform_name) { - return new HmeAjax(this.iRegReport.reportPlatfromUnitWithYear("'载人潜水器'", platform_name)); - } - - /*************** - * 无人航行潜水器 - */ - @RequestMapping("platform/auv/unit/year.htm") - public HmeAjax platformAuvUnitYear(String platform_name) { - return new HmeAjax(this.iRegReport.reportPlatfromUnitWithYear("'水下自主式无人潜器'", platform_name)); - } - - /*************** - * 遥控潜水器 - */ - @RequestMapping("platform/rov/unit/year.htm") - public HmeAjax platformRovUnitYear(String platform_name) { - return new HmeAjax(this.iRegReport.reportPlatfromUnitWithYear("'遥控水下机器人'", platform_name)); - } - - /*************** - * 载人潜水器 - */ - @RequestMapping("platform/hov/diving.htm") - public HmeAjax platformHovDiving(String platform_name, LocalDate start, LocalDate end,Integer year) { - return new HmeAjax(this.iRegReport.reportPlatformDiving("'载人潜水器'", platform_name, start, end,year)); - } - - /*************** - * 无人航行潜水器 - */ - @RequestMapping("platform/auv/diving.htm") - public HmeAjax platformAuvDiving(String platform_name, LocalDate start, LocalDate end,Integer year) { - return new HmeAjax(this.iRegReport.reportPlatformDiving("'水下自主式无人潜器'", platform_name, start, end,year)); - } - - /*************** - * 遥控潜水器 - */ - @RequestMapping("platform/rov/diving.htm") - public HmeAjax platformRovDiving(String platform_name, LocalDate start, LocalDate end,Integer year) { - return new HmeAjax(this.iRegReport.reportPlatformDiving("'遥控水下机器人'", platform_name, start, end, year)); - } - - -} +package cn.tsy.cas.idsse.dsds.control.report; + +import java.time.LocalDate; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.jdbc.entity.SqlConditionType; +import cn.hme.framework.jdbc.entity.SqlQuery; +import cn.tsy.cas.idsse.dsds.thread.DSDSReportThread; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictReportMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegReportMapper; + +@RestController +@RequestMapping("report") +public class DSDSReportControl extends HmeAjaxControl { + @Autowired + private IVoyageRegMapper iReg; + @Autowired + private IVoyageRegReportMapper iRegReport; + @Autowired + private IDictReportMapper iReport; + + @RequestMapping("main.htm") + public HmeAjax list() { + return new HmeAjax(DSDSReportThread.map); + } + + /******************* + * 返回所有配置的前端报表需要的排序 + */ + @RequestMapping("type/list.htm") + public HmeAjax listType() { + return new HmeAjax(iReport.listByColumn("report_status", "Active", "report_type", "report_order")); + } + + /*************** + * 科考船汇总统计属性 + */ + @RequestMapping("ship/total.htm") + public HmeAjax totalShip(String ship_name, LocalDate start, LocalDate end,Integer year) { + return new HmeAjax(this.iRegReport.reportShipTotal(ship_name, start, end,year)); + } + + /*************** + * 科考船航次 + */ + @RequestMapping("ship/voyage.htm") + public HmeAjax shipVoyage(String ship_name, LocalDate start, LocalDate end) { + SqlQuery query = SqlQuery.create().addOrder("voyage_start_date"); + if (HmeStringHelper.hasValue(ship_name)) + query.addCondition("ship_name", ship_name); + if (start != null) + query.addCondition("voyage_start_date", start, SqlConditionType.GTE); + if (end != null) + query.addCondition("voyage_start_date", end, SqlConditionType.LTE); + return new HmeAjax(this.iReg.list(query)); + } + + /*************** + * 参航单位地图 + */ + @RequestMapping("ship/unit.htm") + public HmeAjax shipUnit(String ship_name, LocalDate start, LocalDate end,Integer year) { + return new HmeAjax(this.iRegReport.reportShipUnit(ship_name, start, end,year)); + } + /*************** + * 参航单位地图 + */ + @RequestMapping("ship/unit/year.htm") + public HmeAjax shipUnitYear(String ship_name) { + return new HmeAjax(this.iRegReport.reportShipUnitWithYear(ship_name)); + } + + /*************** + * 载人潜水器 + */ + @RequestMapping("platform/hov.htm") + public HmeAjax platformHov(String platform_name, LocalDate start, LocalDate end,Integer year) { + return new HmeAjax(this.iRegReport.reportPlatformTotal("'载人潜水器'", platform_name, start, end,year)); + } + + /*************** + * 无人航行潜水器 + */ + @RequestMapping("platform/auv.htm") + public HmeAjax platformAuv(String platform_name, LocalDate start, LocalDate end,Integer year) { + return new HmeAjax(this.iRegReport.reportPlatformTotal("'水下自主式无人潜器'", platform_name, start, end,year)); + } + + /*************** + * 遥控潜水器 + */ + @RequestMapping("platform/rov.htm") + public HmeAjax platformRov(String platform_name, LocalDate start, LocalDate end,Integer year) { + return new HmeAjax(this.iRegReport.reportPlatformTotal("'遥控水下机器人'", platform_name, start, end,year)); + } + + /*************** + * 载人潜水器 + */ + @RequestMapping("platform/hov/unit.htm") + public HmeAjax platformHovUnit(String platform_name, LocalDate start, LocalDate end,Integer year) { + return new HmeAjax(this.iRegReport.reportPlatformUnit("'载人潜水器'", platform_name, start, end,year)); + } + + /*************** + * 无人航行潜水器 + */ + @RequestMapping("platform/auv/unit.htm") + public HmeAjax platformAuvUnit(String platform_name, LocalDate start, LocalDate end,Integer year) { + return new HmeAjax(this.iRegReport.reportPlatformUnit("'水下自主式无人潜器'", platform_name, start, end,year)); + } + + /*************** + * 遥控潜水器 + */ + @RequestMapping("platform/rov/unit.htm") + public HmeAjax platformRovUnit(String platform_name, LocalDate start, LocalDate end,Integer year) { + return new HmeAjax(this.iRegReport.reportPlatformUnit("'遥控水下机器人'", platform_name, start, end, year)); + } + + + /*************** + * 载人潜水器 + */ + @RequestMapping("platform/hov/unit/year.htm") + public HmeAjax platformHovUnitYear(String platform_name) { + return new HmeAjax(this.iRegReport.reportPlatfromUnitWithYear("'载人潜水器'", platform_name)); + } + + /*************** + * 无人航行潜水器 + */ + @RequestMapping("platform/auv/unit/year.htm") + public HmeAjax platformAuvUnitYear(String platform_name) { + return new HmeAjax(this.iRegReport.reportPlatfromUnitWithYear("'水下自主式无人潜器'", platform_name)); + } + + /*************** + * 遥控潜水器 + */ + @RequestMapping("platform/rov/unit/year.htm") + public HmeAjax platformRovUnitYear(String platform_name) { + return new HmeAjax(this.iRegReport.reportPlatfromUnitWithYear("'遥控水下机器人'", platform_name)); + } + + /*************** + * 载人潜水器 + */ + @RequestMapping("platform/hov/diving.htm") + public HmeAjax platformHovDiving(String platform_name, LocalDate start, LocalDate end,Integer year) { + return new HmeAjax(this.iRegReport.reportPlatformDiving("'载人潜水器'", platform_name, start, end,year)); + } + + /*************** + * 无人航行潜水器 + */ + @RequestMapping("platform/auv/diving.htm") + public HmeAjax platformAuvDiving(String platform_name, LocalDate start, LocalDate end,Integer year) { + return new HmeAjax(this.iRegReport.reportPlatformDiving("'水下自主式无人潜器'", platform_name, start, end,year)); + } + + /*************** + * 遥控潜水器 + */ + @RequestMapping("platform/rov/diving.htm") + public HmeAjax platformRovDiving(String platform_name, LocalDate start, LocalDate end,Integer year) { + return new HmeAjax(this.iRegReport.reportPlatformDiving("'遥控水下机器人'", platform_name, start, end, year)); + } + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleDatasetControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleDatasetControl.java index 9af3607..37c5298 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleDatasetControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleDatasetControl.java @@ -1,84 +1,84 @@ -package cn.tsy.cas.idsse.dsds.control.sample; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.helper.excel.HmeExcelReaderHelper; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.cas.idsse.dsds.service.sample.SampleDatasetService; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; - -@RestController -@RequestMapping("sample/dataset") -@CrossOrigin -public class SampleDatasetControl extends HmeAjaxControl { - - @Autowired - private ISampleDatasetMapper mDataset; - - - @Autowired - private SampleDatasetService sDataset; - - @RequestMapping("page.htm") - public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { - order = HmeStringHelper.hasValue(order) ? order : "create_time"; - type = HmeStringHelper.hasValue(type) ? type : "DESC"; - Pageable page = this.mDataset.datasetWithPage(group, start, limit, query, order, type); - return new HmeAjax(page); - } - - @RequestMapping("find.htm") - public HmeAjax find(int dataset_id) { - return new HmeAjax(this.mDataset.find(dataset_id)); - } - - - @RequestMapping("edit.htm") - public HmeAjax edit(SampleDataset dataset,Integer old_dataset_id) { - return new HmeAjax(this.sDataset.editDataset(dataset, old_dataset_id,DSDSWebHelper.getFrameOptr(true))); - } - - @CrossOrigin - @RequestMapping("upload.htm") - public HmeAjax upload(MultipartFile file) { - - DSDSWebHelper.getFrameOptr(true); - List> values = HmeExcelReaderHelper.readSheet(file, 1, 40); - if (values.size() == 0) - throw new BusinessException("导入的文件中无有效数据，请检查！"); - this.sDataset.uploadSample(values, DSDSWebHelper.getFrameOptr(true)); - return new HmeAjax(); - } - -// @RequestMapping("sample/list.htm") -// public HmeAjax listSample(int dataset_id) { -// SampleDataset dataset = this.mDataset.find(dataset_id); -// return new HmeAjax(this.sDataset.editDataset(dataset, getFrameOptr())); -// } -// -// - - - @RequestMapping("delete.htm") - public HmeAjax delete(int tsy_id) { - - DSDSWebHelper.getFrameOptr(true); - this.sDataset.deleteDataset(tsy_id); - return new HmeAjax(); - } - - - -} +package cn.tsy.cas.idsse.dsds.control.sample; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.helper.excel.HmeExcelReaderHelper; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.cas.idsse.dsds.service.sample.SampleDatasetService; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; + +@RestController +@RequestMapping("sample/dataset") +@CrossOrigin +public class SampleDatasetControl extends HmeAjaxControl { + + @Autowired + private ISampleDatasetMapper mDataset; + + + @Autowired + private SampleDatasetService sDataset; + + @RequestMapping("page.htm") + public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { + order = HmeStringHelper.hasValue(order) ? order : "create_time"; + type = HmeStringHelper.hasValue(type) ? type : "DESC"; + Pageable page = this.mDataset.datasetWithPage(group, start, limit, query, order, type); + return new HmeAjax(page); + } + + @RequestMapping("find.htm") + public HmeAjax find(int dataset_id) { + return new HmeAjax(this.mDataset.find(dataset_id)); + } + + + @RequestMapping("edit.htm") + public HmeAjax edit(SampleDataset dataset,Integer old_dataset_id) { + return new HmeAjax(this.sDataset.editDataset(dataset, old_dataset_id,DSDSWebHelper.getFrameOptr(true))); + } + + @CrossOrigin + @RequestMapping("upload.htm") + public HmeAjax upload(MultipartFile file) { + + DSDSWebHelper.getFrameOptr(true); + List> values = HmeExcelReaderHelper.readSheet(file, 1, 40); + if (values.size() == 0) + throw new BusinessException("导入的文件中无有效数据，请检查！"); + this.sDataset.uploadSample(values, DSDSWebHelper.getFrameOptr(true)); + return new HmeAjax(); + } + +// @RequestMapping("sample/list.htm") +// public HmeAjax listSample(int dataset_id) { +// SampleDataset dataset = this.mDataset.find(dataset_id); +// return new HmeAjax(this.sDataset.editDataset(dataset, getFrameOptr())); +// } +// +// + + + @RequestMapping("delete.htm") + public HmeAjax delete(int tsy_id) { + + DSDSWebHelper.getFrameOptr(true); + this.sDataset.deleteDataset(tsy_id); + return new HmeAjax(); + } + + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleDatasetTrackControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleDatasetTrackControl.java index 996205f..6db9028 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleDatasetTrackControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleDatasetTrackControl.java @@ -1,99 +1,99 @@ -package cn.tsy.cas.idsse.dsds.control.sample; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.frame.helper.HmeWebHelper; -import cn.hme.framework.helper.io.HmeFileHelper; -import cn.hme.framework.helper.io.HmeMultipartFileHelper; -import cn.hme.framework.helper.time.HmeLocalDateHelper; -import cn.hme.framework.jdbc.entity.OrderBy; -import cn.hme.framework.jdbc.entity.SqlQuery; -import cn.tsy.cas.idsse.dsds.helper.DSDSParamHelper; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.cas.idsse.dsds.service.sample.SampleDatasetTrackService; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetTrackMapper; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDatasetTrack; - -@RestController -@RequestMapping("sample/dataset/track") -@CrossOrigin -public class SampleDatasetTrackControl extends HmeAjaxControl { - - @Autowired - private ISampleDatasetMapper mData; - @Autowired - private ISampleDatasetTrackMapper mTrack; - - @Autowired - private SampleDatasetTrackService sTrack; - - @RequestMapping("total.htm") - public HmeAjax total(int dataset_id) { - Map value = this.mTrack.totalTrack(dataset_id); - Map mapReturn = new HashMap<>(); - if(value==null) - return new HmeAjax(mapReturn); - SampleDatasetTrack start = - this.mTrack.list(SqlQuery.create() - .addCondition("dataset_id", dataset_id) - .addCondition("track_time", value.get("min_time"))).get(0); - SampleDatasetTrack end = - this.mTrack.list(SqlQuery.create() - .addCondition("dataset_id", dataset_id) - .addCondition("track_time", value.get("max_time"))).get(0); - mapReturn.put("start", start); - mapReturn.put("end", end); - return new HmeAjax(mapReturn); - } - - - @RequestMapping("list.htm") - public HmeAjax list(int dataset_id) { - //return new HmeAjax(this.mTrack.selectListByColumnAndSimpleOrder("dataset_id", dataset_id, OrderBy.of("track_time"))); - return new HmeAjax(this.mTrack.listTrack(dataset_id, DSDSParamHelper.DatasetNaviagtionTicketMinutes)); - } - - @CrossOrigin - @RequestMapping("upload.htm") - public HmeAjax upload(int dataset_id, MultipartFile file) { - - DSDSWebHelper.getFrameOptr(true); - File f = HmeMultipartFileHelper.fromUpload(file); - List array = HmeFileHelper.readAsArray(f.getPath()); - f.delete(); - List list = this.sTrack.uploadTrack(dataset_id, array,file.getOriginalFilename(), DSDSWebHelper.getFrameOptr(true)); - if (list.size() == 0) - throw new BusinessException("未找到有效的轨迹文件(已忽略相同的记录)！"); - return new HmeAjax(file.getOriginalFilename()); - } - - @RequestMapping("download.htm") - public void download(int dataset_id) { - SampleDataset dataset = this.mData.find(dataset_id); - List array = this.mTrack.listByColumnWithOrder("dataset_id", dataset_id, OrderBy.of("track_time")); - List values = new ArrayList<>(); - for (SampleDatasetTrack nav : array) { - values.add(nav.getTrack_lon() + " " + nav.getTrack_lat() + " " + HmeLocalDateHelper.format(nav.getTrack_time()).replace(" ", "-")); - } - File tmpFile = HmeFileHelper.createTempFile(); - HmeFileHelper.writeFile(tmpFile, values); - // TS2-29-1_0918-1007 - HmeWebHelper.downloadFile(tmpFile, dataset.getDiving_track_file(), true); - } - -} +package cn.tsy.cas.idsse.dsds.control.sample; + +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.frame.helper.HmeWebHelper; +import cn.hme.framework.helper.io.HmeFileHelper; +import cn.hme.framework.helper.io.HmeMultipartFileHelper; +import cn.hme.framework.helper.time.HmeLocalDateHelper; +import cn.hme.framework.jdbc.entity.OrderBy; +import cn.hme.framework.jdbc.entity.SqlQuery; +import cn.tsy.cas.idsse.dsds.helper.DSDSParamHelper; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.cas.idsse.dsds.service.sample.SampleDatasetTrackService; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetTrackMapper; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDatasetTrack; + +@RestController +@RequestMapping("sample/dataset/track") +@CrossOrigin +public class SampleDatasetTrackControl extends HmeAjaxControl { + + @Autowired + private ISampleDatasetMapper mData; + @Autowired + private ISampleDatasetTrackMapper mTrack; + + @Autowired + private SampleDatasetTrackService sTrack; + + @RequestMapping("total.htm") + public HmeAjax total(int dataset_id) { + Map value = this.mTrack.totalTrack(dataset_id); + Map mapReturn = new HashMap<>(); + if(value==null) + return new HmeAjax(mapReturn); + SampleDatasetTrack start = + this.mTrack.list(SqlQuery.create() + .addCondition("dataset_id", dataset_id) + .addCondition("track_time", value.get("min_time"))).get(0); + SampleDatasetTrack end = + this.mTrack.list(SqlQuery.create() + .addCondition("dataset_id", dataset_id) + .addCondition("track_time", value.get("max_time"))).get(0); + mapReturn.put("start", start); + mapReturn.put("end", end); + return new HmeAjax(mapReturn); + } + + + @RequestMapping("list.htm") + public HmeAjax list(int dataset_id) { + //return new HmeAjax(this.mTrack.selectListByColumnAndSimpleOrder("dataset_id", dataset_id, OrderBy.of("track_time"))); + return new HmeAjax(this.mTrack.listTrack(dataset_id, DSDSParamHelper.DatasetNaviagtionTicketMinutes)); + } + + @CrossOrigin + @RequestMapping("upload.htm") + public HmeAjax upload(int dataset_id, MultipartFile file) { + + DSDSWebHelper.getFrameOptr(true); + File f = HmeMultipartFileHelper.fromUpload(file); + List array = HmeFileHelper.readAsArray(f.getPath()); + f.delete(); + List list = this.sTrack.uploadTrack(dataset_id, array,file.getOriginalFilename(), DSDSWebHelper.getFrameOptr(true)); + if (list.size() == 0) + throw new BusinessException("未找到有效的轨迹文件(已忽略相同的记录)！"); + return new HmeAjax(file.getOriginalFilename()); + } + + @RequestMapping("download.htm") + public void download(int dataset_id) { + SampleDataset dataset = this.mData.find(dataset_id); + List array = this.mTrack.listByColumnWithOrder("dataset_id", dataset_id, OrderBy.of("track_time")); + List values = new ArrayList<>(); + for (SampleDatasetTrack nav : array) { + values.add(nav.getTrack_lon() + " " + nav.getTrack_lat() + " " + HmeLocalDateHelper.format(nav.getTrack_time()).replace(" ", "-")); + } + File tmpFile = HmeFileHelper.createTempFile(); + HmeFileHelper.writeFile(tmpFile, values); + // TS2-29-1_0918-1007 + HmeWebHelper.downloadFile(tmpFile, dataset.getDiving_track_file(), true); + } + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleDivingControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleDivingControl.java index b0cc429..67fabe8 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleDivingControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleDivingControl.java @@ -1,52 +1,62 @@ -package cn.tsy.cas.idsse.dsds.control.sample; - -import java.io.File; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.helper.io.HmeFileHelper; -import cn.hme.framework.helper.io.HmeMultipartFileHelper; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.cas.idsse.dsds.service.sample.SampleDatasetTrackService; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; - -@RestController -@RequestMapping("sample/diving") -@CrossOrigin -public class SampleDivingControl extends HmeAjaxControl { - - @Autowired - private ISampleDatasetMapper mDataset; -// @Autowired -// private ISampleDatasetTrackMapper mTrack; - - @Autowired - private SampleDatasetTrackService sTrack; - - @CrossOrigin - @RequestMapping("upload.htm") - public HmeAjax upload(MultipartFile file) { - DSDSWebHelper.getFrameOptr(true); - File f = HmeMultipartFileHelper.fromUpload(file); - List array = HmeFileHelper.readAsArray(f.getPath()); - f.delete(); - List arrayDataset = this.mDataset.listByColumn("diving_sn", - file.getOriginalFilename().replace(".txt", "")); - - if (arrayDataset.size() == 0) - return new HmeAjax(); - this.sTrack.uploadTrack(arrayDataset.get(0).getTsy_id(), array, file.getOriginalFilename(), - DSDSWebHelper.getFrameOptr(true)); - - return new HmeAjax(file.getOriginalFilename()); - } - -} +package cn.tsy.cas.idsse.dsds.control.sample; + +import java.io.File; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.helper.io.HmeFileHelper; +import cn.hme.framework.helper.io.HmeMultipartFileHelper; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.cas.idsse.dsds.service.sample.SampleDatasetTrackService; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; + +@RestController +@RequestMapping("sample/diving") +@CrossOrigin +public class SampleDivingControl extends HmeAjaxControl { + + @Autowired + private ISampleDatasetMapper mDataset; +// @Autowired +// private ISampleDatasetTrackMapper mTrack; + + @Autowired + private SampleDatasetTrackService sTrack; + + @CrossOrigin + @RequestMapping("upload.htm") + public HmeAjax upload(MultipartFile file) { + DSDSWebHelper.getFrameOptr(true); + File f = HmeMultipartFileHelper.fromUpload(file); + List array = HmeFileHelper.readAsArray(f.getPath()); + f.delete(); + List arrayDataset = this.mDataset.listByColumn("diving_sn", + file.getOriginalFilename().replace(".txt", "")); + + if (arrayDataset.size() == 0) + return new HmeAjax(); + this.sTrack.uploadTrack(arrayDataset.get(0).getTsy_id(), array, file.getOriginalFilename(), + DSDSWebHelper.getFrameOptr(true)); + + return new HmeAjax(file.getOriginalFilename()); + } + + + @CrossOrigin + @RequestMapping("list.htm") + public HmeAjax list() { + String sql = "select max(tsy_id) tsy_id,diving_sn from (" + + "select r.*,d.dataset_id,d.track_total from sample_dataset r,(select dataset_id,count(1) track_total from sample_dataset_track group by dataset_id) d where r.tsy_id=d.dataset_id " + + ") t group by diving_sn order by diving_sn"; + + return new HmeAjax(this.mDataset.listBySql(sql)); + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleLineControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleLineControl.java index 919a6a6..68ef960 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleLineControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleLineControl.java @@ -1,74 +1,74 @@ -package cn.tsy.cas.idsse.dsds.control.sample; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.jdbc.entity.OrderBy; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.hme.framework.jdbc.helper.HmeSQLHelper; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.cas.idsse.dsds.service.sample.SampleLineService; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleLineMapper; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleLine; - -@RestController -@RequestMapping("sample/line") -@CrossOrigin -public class SampleLineControl extends HmeAjaxControl { - - @Autowired - private ISampleLineMapper mLine; - @Autowired - private SampleLineService sLine; - - - @RequestMapping("page.htm") - public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { - order = HmeStringHelper.hasValue(order) ? order : "sample_name"; - type = HmeStringHelper.hasValue(type) ? type : "DESC"; - Pageable page = this.mLine.page(group,start, limit, HmeSQLHelper.makePageSqlQuery(query, order, type, - "sample_name","funding_org","sample_tag_name","sample_tag_value","sample_remark")); - return new HmeAjax(page); - } - - -// @RequestMapping("list.htm") -// public HmeAjax list(int dataset_id) { -// return new HmeAjax(this.mLine.selectListByColumnAndSimpleOrder("dataset_id", dataset_id, OrderBy.of("create_time", DirectionEnum.DESC))); -// } - - @RequestMapping("list.htm") - public HmeAjax list(int dataset_id,String order,String type) { - if(HmeStringHelper.isEmpty(order)) - order = "sample_name"; - if(HmeStringHelper.isEmpty(type)) - type = "DESC"; - return new HmeAjax(this.mLine.listByColumnWithOrder("dataset_id", dataset_id,OrderBy.of(order, type) )); - } - - @RequestMapping("edit.htm") - public HmeAjax edit(int dataset_id, SampleLine line) { - this.sLine.editLine(dataset_id, line, DSDSWebHelper.getFrameOptr(true)); - return new HmeAjax(line); - } - - - @RequestMapping("find.htm") - public HmeAjax find(int tsy_id) { - return new HmeAjax(this.mLine.find(tsy_id)); - } - - @RequestMapping("delete.htm") - public HmeAjax delete(int tsy_id) { - DSDSWebHelper.getFrameOptr(true); - this.sLine.deleteLine(tsy_id); - return new HmeAjax(); - } - - -} +package cn.tsy.cas.idsse.dsds.control.sample; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.jdbc.entity.OrderBy; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.hme.framework.jdbc.helper.HmeSQLHelper; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.cas.idsse.dsds.service.sample.SampleLineService; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleLineMapper; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleLine; + +@RestController +@RequestMapping("sample/line") +@CrossOrigin +public class SampleLineControl extends HmeAjaxControl { + + @Autowired + private ISampleLineMapper mLine; + @Autowired + private SampleLineService sLine; + + + @RequestMapping("page.htm") + public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { + order = HmeStringHelper.hasValue(order) ? order : "sample_name"; + type = HmeStringHelper.hasValue(type) ? type : "DESC"; + Pageable page = this.mLine.page(group,start, limit, HmeSQLHelper.makePageSqlQuery(query, order, type, + "sample_name","funding_org","sample_tag_name","sample_tag_value","sample_remark")); + return new HmeAjax(page); + } + + +// @RequestMapping("list.htm") +// public HmeAjax list(int dataset_id) { +// return new HmeAjax(this.mLine.selectListByColumnAndSimpleOrder("dataset_id", dataset_id, OrderBy.of("create_time", DirectionEnum.DESC))); +// } + + @RequestMapping("list.htm") + public HmeAjax list(int dataset_id,String order,String type) { + if(HmeStringHelper.isEmpty(order)) + order = "sample_name"; + if(HmeStringHelper.isEmpty(type)) + type = "DESC"; + return new HmeAjax(this.mLine.listByColumnWithOrder("dataset_id", dataset_id,OrderBy.of(order, type) )); + } + + @RequestMapping("edit.htm") + public HmeAjax edit(int dataset_id, SampleLine line) { + this.sLine.editLine(dataset_id, line, DSDSWebHelper.getFrameOptr(true)); + return new HmeAjax(line); + } + + + @RequestMapping("find.htm") + public HmeAjax find(int tsy_id) { + return new HmeAjax(this.mLine.find(tsy_id)); + } + + @RequestMapping("delete.htm") + public HmeAjax delete(int tsy_id) { + DSDSWebHelper.getFrameOptr(true); + this.sLine.deleteLine(tsy_id); + return new HmeAjax(); + } + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleLineTrackControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleLineTrackControl.java index 42b19ba..4ced62d 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleLineTrackControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleLineTrackControl.java @@ -1,45 +1,36 @@ -package cn.tsy.cas.idsse.dsds.control.sample; - -import java.io.File; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.helper.io.HmeFileHelper; -import cn.hme.framework.helper.io.HmeMultipartFileHelper; -import cn.tsy.cas.idsse.dsds.service.sample.SampleLineTrackService; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleLineTrack; - -@RestController -@RequestMapping("sample/line/track") -@CrossOrigin -public class SampleLineTrackControl extends HmeAjaxControl { - - - @Autowired - private SampleLineTrackService sTrack; - - - - @CrossOrigin - @RequestMapping("upload.htm") - public HmeAjax upload(int dataset_id, MultipartFile file) { - // DSDSWebHelper.getFrameOptr(true); - File f = HmeMultipartFileHelper.fromUpload(file); - List array = HmeFileHelper.readAsArray(f.getPath()); - f.delete(); - List list = this.sTrack.uploadTrack(dataset_id, array,file.getOriginalFilename()); -// if (list.size() == 0) -// throw new BusinessException("未找到有效的轨迹文件(已忽略相同的记录)！"); - return new HmeAjax(file.getOriginalFilename()); - } - - - -} +package cn.tsy.cas.idsse.dsds.control.sample; + +import java.io.File; + +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.helper.io.HmeMultipartFileHelper; + +@RestController +@RequestMapping("sample/line/track") +@CrossOrigin +public class SampleLineTrackControl extends HmeAjaxControl { + + + + @CrossOrigin + @RequestMapping("upload.htm") + public HmeAjax upload(int dataset_id, MultipartFile file) { + // DSDSWebHelper.getFrameOptr(true); + File f = HmeMultipartFileHelper.fromUpload(file); + //List array = HmeFileHelper.readAsArray(f.getPath()); + f.delete(); + //List list = this.sTrack.uploadTrack(dataset_id, array,file.getOriginalFilename()); +// if (list.size() == 0) +// throw new BusinessException("未找到有效的轨迹文件(已忽略相同的记录)！"); + return new HmeAjax(file.getOriginalFilename()); + } + + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleStationControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleStationControl.java index 0307cda..352406e 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleStationControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/sample/SampleStationControl.java @@ -1,67 +1,67 @@ -package cn.tsy.cas.idsse.dsds.control.sample; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.jdbc.entity.OrderBy; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.hme.framework.jdbc.helper.HmeSQLHelper; -import cn.tsy.cas.idsse.dsds.control.DSDSControl; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.cas.idsse.dsds.service.sample.SampleStationService; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleStationMapper; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleStation; - -@RestController -@RequestMapping("sample/station") -@CrossOrigin -public class SampleStationControl extends DSDSControl { - - @Autowired - private ISampleStationMapper mStation; - @Autowired - private SampleStationService sStation; - - @RequestMapping("page.htm") - public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { - order = HmeStringHelper.hasValue(order) ? order : "sample_name"; - type = HmeStringHelper.hasValue(type) ? type : "DESC"; - Pageable page = this.mStation.page(group, start,limit, HmeSQLHelper.makePageSqlQuery(query, order, type, - "sample_name","funding_org","sample_tag_name","sample_tag_value","sample_remark")); - return new HmeAjax(page); - } - - @RequestMapping("list.htm") - public HmeAjax list(int dataset_id,String order,String type) { - if(HmeStringHelper.isEmpty(order)) - order = "sample_name"; - if(HmeStringHelper.isEmpty(type)) - type = "DESC"; - return new HmeAjax(this.mStation.listByColumnWithOrder("dataset_id", dataset_id,OrderBy.of(order, type) )); - } - - @RequestMapping("edit.htm") - public HmeAjax edit(int dataset_id, SampleStation station) { - this.sStation.editStation(dataset_id, station, getFrameOptr()); - return new HmeAjax(station); - } - - - @RequestMapping("find.htm") - public HmeAjax find(int tsy_id) { - return new HmeAjax(this.mStation.find(tsy_id)); - } - - @RequestMapping("delete.htm") - public HmeAjax delete(int tsy_id) { - DSDSWebHelper.getFrameOptr(true); - this.sStation.deleteStation(tsy_id); - return new HmeAjax(); - } - - -} +package cn.tsy.cas.idsse.dsds.control.sample; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.jdbc.entity.OrderBy; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.hme.framework.jdbc.helper.HmeSQLHelper; +import cn.tsy.cas.idsse.dsds.control.DSDSControl; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.cas.idsse.dsds.service.sample.SampleStationService; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleStationMapper; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleStation; + +@RestController +@RequestMapping("sample/station") +@CrossOrigin +public class SampleStationControl extends DSDSControl { + + @Autowired + private ISampleStationMapper mStation; + @Autowired + private SampleStationService sStation; + + @RequestMapping("page.htm") + public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { + order = HmeStringHelper.hasValue(order) ? order : "sample_name"; + type = HmeStringHelper.hasValue(type) ? type : "DESC"; + Pageable page = this.mStation.page(group, start,limit, HmeSQLHelper.makePageSqlQuery(query, order, type, + "sample_name","funding_org","sample_tag_name","sample_tag_value","sample_remark")); + return new HmeAjax(page); + } + + @RequestMapping("list.htm") + public HmeAjax list(int dataset_id,String order,String type) { + if(HmeStringHelper.isEmpty(order)) + order = "sample_name"; + if(HmeStringHelper.isEmpty(type)) + type = "DESC"; + return new HmeAjax(this.mStation.listByColumnWithOrder("dataset_id", dataset_id,OrderBy.of(order, type) )); + } + + @RequestMapping("edit.htm") + public HmeAjax edit(int dataset_id, SampleStation station) { + this.sStation.editStation(dataset_id, station, getFrameOptr()); + return new HmeAjax(station); + } + + + @RequestMapping("find.htm") + public HmeAjax find(int tsy_id) { + return new HmeAjax(this.mStation.find(tsy_id)); + } + + @RequestMapping("delete.htm") + public HmeAjax delete(int tsy_id) { + DSDSWebHelper.getFrameOptr(true); + this.sStation.deleteStation(tsy_id); + return new HmeAjax(); + } + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/search/SearchControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/search/SearchControl.java index 877b9e0..2297123 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/search/SearchControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/search/SearchControl.java @@ -1,139 +1,139 @@ -package cn.tsy.cas.idsse.dsds.control.search; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.data.frame.model.HmeFrameOptr; -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.helper.lang.HmeCollectionHelper; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictDataMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictEquipmentMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictPlatformMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; - -@RestController -@RequestMapping("search") -@CrossOrigin -public class SearchControl extends HmeAjaxControl { - @Autowired - private IVoyageRegMapper mVoyage; - @Autowired - private IDictPlatformMapper mPlatform; - @Autowired - private IDictEquipmentMapper mEquipment; - @Autowired - private IDictDataMapper mData; - - @RequestMapping("page.htm") - public HmeAjax page(Integer group, Integer limit, Integer start, String search_type, String order, String type, String return_type, String search_value, Integer[] ids) { - // String where += "select t.tsy_id from sample_dataset t,voyage y where y.tsy_id=t.voyage_id"; - String where = ""; - if ("航次名称".equals(search_type)) { - if (ids == null || ids.length < 1) { - where += " and t.voyage_name like concat('%','" + search_value + "','%') "; - } else { - where += " and voyage_id in(" + HmeCollectionHelper.join(ids, ",") + ") "; - } - } else if ("平台类型".equals(search_type)) { - if (ids == null || ids.length < 1) { - where += " and (platform_type like concat('%','" + search_value + "','%') or platform_alias like concat('%','" + search_value + "','%')) "; - } else { - where += " and platform_id in(" + HmeCollectionHelper.join(ids, ",") + ") "; - } - } else if ("平台名称".equals(search_type)) { - where += " and platform_name like concat('%','" + search_value + "','%') "; - - } else if ("设备类型".equals(search_type)) { - if (ids == null || ids.length < 1) { - where += " and (equipment_type like concat('%','" + search_value + "','%') or equipment_alias like concat('%','" + search_value + "','%')) "; - } else { - where += " and equipment_id in(" + HmeCollectionHelper.join(ids, ",") + ") "; - } - } else if ("数据集名称".equals(search_type)) { - where += " and (dataset_name like concat('%','" + search_value + "','%')) "; - } else if ("数据样品类型".equals(search_type)) { - if (ids == null || ids.length < 1) { - where += " and (data_type like concat('%','" + search_value + "','%') or data_alias like concat('%','" + search_value + "','%')) "; - } else { - where += " and data_id in(" + HmeCollectionHelper.join(ids, ",") + ") "; - } - } else if ("航次首席".equals(search_type)) { - where += " and voyage_officer like concat('%'," + search_value + ",'%') "; - } - - if ("数据样品集".equals(return_type)) { - String sql = "select t.* from (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) t,voyage_reg y where y.tsy_id=t.voyage_id " + where + " order by t.create_time desc"; - return new HmeAjax(this.mVoyage.pageBySql(group, start, limit, sql)); - } else { - // 航次 - String sql = "select t.* from voyage_reg t where tsy_id in (" + "select distinct t.voyage_id from sample_dataset t,voyage_reg y where y.tsy_id=t.voyage_id " + " " + where + ") order by t.create_time desc"; - return new HmeAjax(this.mVoyage.pageBySql(group, start, limit, sql)); - - } - - } - - @RequestMapping("mult.htm") - public HmeAjax mult(String search_type, Integer group, Integer limit, Integer start, String order, String type, SearchParam param) { - HmeFrameOptr optr = DSDSWebHelper.getFrameOptr(false); - if ("航次名称".endsWith(search_type)) - return new HmeAjax(this.mVoyage.searchWithPage(group, start, limit, search_type, order, type, - optr == null ? null : optr.getRole_id(), optr == null ? null : optr.getOptr_id(), param)); - if ("平台类型".endsWith(search_type)) - return new HmeAjax(this.mPlatform.searchWithPage(group, start, limit, search_type, order, type, param)); - if ("设备类型".endsWith(search_type)) - return new HmeAjax(this.mEquipment.searchWithPage(group, start, limit, search_type, order, type, param)); - if ("数据样品类型".endsWith(search_type)) - return new HmeAjax(this.mData.searchWithPage(group, start, limit, search_type, order, type, param)); - return new HmeAjax(); - } - - @RequestMapping("result.htm") - public HmeAjax result(Integer group, Integer limit, Integer start, String order, String type, String return_type, String search_type, String search_value, SearchParam param) { - - String where = ""; - if (HmeStringHelper.hasValue(param.getVoyage_name())) - where += " and t.voyage_name ='" + param.getVoyage_name() + "' "; - if (HmeStringHelper.hasValue(param.getPlatform_type())) - where += " and platform_type ='" + param.getPlatform_type() + "' "; - if (HmeStringHelper.hasValue(param.getEquipment_type())) - where += " and equipment_type ='" + param.getEquipment_type() + "' "; - if (HmeStringHelper.hasValue(param.getData_type())) - where += " and data_type ='" + param.getData_type() + "' "; - - if (HmeStringHelper.hasValue(search_value)) { - if ("航次名称".equals(search_type)) { - where += " and t.voyage_name like concat('%','" + search_value + "','%') "; - } else if ("平台类型".equals(search_type)) { - where += " and (platform_type like concat('%','" + search_value + "','%') or platform_alias like concat('%','" + search_value + "','%')) "; - } else if ("平台名称".equals(search_type)) { - where += " and platform_name like concat('%','" + search_value + "','%') "; - } else if ("设备类型".equals(search_type)) { - where += " and (equipment_type like concat('%','" + search_value + "','%') or equipment_alias like concat('%','" + search_value + "','%')) "; - } else if ("数据集名称".equals(search_type)) { - where += " and (dataset_name like concat('%','" + search_value + "','%')) "; - } else if ("数据样品类型".equals(search_type)) { - where += " and (data_type like concat('%','" + search_value + "','%') or data_alias like concat('%','" + search_value + "','%')) "; - } else if ("航次首席".equals(search_type)) { - where += " and voyage_officer like concat('%','" + search_value + "','%') "; - } - } - - if ("数据样品集".equals(return_type)) { - String sql = "select t.* from (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) t,voyage_reg y where y.tsy_id=t.voyage_id " + - where + " order by t.create_time desc"; - return new HmeAjax(this.mVoyage.pageBySql(group, start, limit, sql)); - } else { - // 航次 - String sql = "select t.* from voyage_reg t where tsy_id in (" + "select distinct t.voyage_id from sample_dataset t,voyage_reg y where y.tsy_id=t.voyage_id " + " " + where + ") order by t.create_time desc"; - return new HmeAjax(this.mVoyage.pageBySql(group, start, limit, sql)); - - } - - } +package cn.tsy.cas.idsse.dsds.control.search; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.data.frame.model.HmeFrameOptr; +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.helper.lang.HmeCollectionHelper; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictDataMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictEquipmentMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictPlatformMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; + +@RestController +@RequestMapping("search") +@CrossOrigin +public class SearchControl extends HmeAjaxControl { + @Autowired + private IVoyageRegMapper mVoyage; + @Autowired + private IDictPlatformMapper mPlatform; + @Autowired + private IDictEquipmentMapper mEquipment; + @Autowired + private IDictDataMapper mData; + + @RequestMapping("page.htm") + public HmeAjax page(Integer group, Integer limit, Integer start, String search_type, String order, String type, String return_type, String search_value, Integer[] ids) { + // String where += "select t.tsy_id from sample_dataset t,voyage y where y.tsy_id=t.voyage_id"; + String where = ""; + if ("航次名称".equals(search_type)) { + if (ids == null || ids.length < 1) { + where += " and t.voyage_name like concat('%','" + search_value + "','%') "; + } else { + where += " and voyage_id in(" + HmeCollectionHelper.join(ids, ",") + ") "; + } + } else if ("平台类型".equals(search_type)) { + if (ids == null || ids.length < 1) { + where += " and (platform_type like concat('%','" + search_value + "','%') or platform_alias like concat('%','" + search_value + "','%')) "; + } else { + where += " and platform_id in(" + HmeCollectionHelper.join(ids, ",") + ") "; + } + } else if ("平台名称".equals(search_type)) { + where += " and platform_name like concat('%','" + search_value + "','%') "; + + } else if ("设备类型".equals(search_type)) { + if (ids == null || ids.length < 1) { + where += " and (equipment_type like concat('%','" + search_value + "','%') or equipment_alias like concat('%','" + search_value + "','%')) "; + } else { + where += " and equipment_id in(" + HmeCollectionHelper.join(ids, ",") + ") "; + } + } else if ("数据集名称".equals(search_type)) { + where += " and (dataset_name like concat('%','" + search_value + "','%')) "; + } else if ("数据样品类型".equals(search_type)) { + if (ids == null || ids.length < 1) { + where += " and (data_type like concat('%','" + search_value + "','%') or data_alias like concat('%','" + search_value + "','%')) "; + } else { + where += " and data_id in(" + HmeCollectionHelper.join(ids, ",") + ") "; + } + } else if ("航次首席".equals(search_type)) { + where += " and voyage_officer like concat('%'," + search_value + ",'%') "; + } + + if ("数据样品集".equals(return_type)) { + String sql = "select t.* from (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) t,voyage_reg y where y.tsy_id=t.voyage_id " + where + " order by t.create_time desc"; + return new HmeAjax(this.mVoyage.pageBySql(group, start, limit, sql)); + } else { + // 航次 + String sql = "select t.* from voyage_reg t where tsy_id in (" + "select distinct t.voyage_id from sample_dataset t,voyage_reg y where y.tsy_id=t.voyage_id " + " " + where + ") order by t.create_time desc"; + return new HmeAjax(this.mVoyage.pageBySql(group, start, limit, sql)); + + } + + } + + @RequestMapping("mult.htm") + public HmeAjax mult(String search_type, Integer group, Integer limit, Integer start, String order, String type, SearchParam param) { + HmeFrameOptr optr = DSDSWebHelper.getFrameOptr(false); + if ("航次名称".endsWith(search_type)) + return new HmeAjax(this.mVoyage.searchWithPage(group, start, limit, search_type, order, type, + optr == null ? null : optr.getRole_id(), optr == null ? null : optr.getOptr_id(), param)); + if ("平台类型".endsWith(search_type)) + return new HmeAjax(this.mPlatform.searchWithPage(group, start, limit, search_type, order, type, param)); + if ("设备类型".endsWith(search_type)) + return new HmeAjax(this.mEquipment.searchWithPage(group, start, limit, search_type, order, type, param)); + if ("数据样品类型".endsWith(search_type)) + return new HmeAjax(this.mData.searchWithPage(group, start, limit, search_type, order, type, param)); + return new HmeAjax(); + } + + @RequestMapping("result.htm") + public HmeAjax result(Integer group, Integer limit, Integer start, String order, String type, String return_type, String search_type, String search_value, SearchParam param) { + + String where = ""; + if (HmeStringHelper.hasValue(param.getVoyage_name())) + where += " and t.voyage_name ='" + param.getVoyage_name() + "' "; + if (HmeStringHelper.hasValue(param.getPlatform_type())) + where += " and platform_type ='" + param.getPlatform_type() + "' "; + if (HmeStringHelper.hasValue(param.getEquipment_type())) + where += " and equipment_type ='" + param.getEquipment_type() + "' "; + if (HmeStringHelper.hasValue(param.getData_type())) + where += " and data_type ='" + param.getData_type() + "' "; + + if (HmeStringHelper.hasValue(search_value)) { + if ("航次名称".equals(search_type)) { + where += " and t.voyage_name like concat('%','" + search_value + "','%') "; + } else if ("平台类型".equals(search_type)) { + where += " and (platform_type like concat('%','" + search_value + "','%') or platform_alias like concat('%','" + search_value + "','%')) "; + } else if ("平台名称".equals(search_type)) { + where += " and platform_name like concat('%','" + search_value + "','%') "; + } else if ("设备类型".equals(search_type)) { + where += " and (equipment_type like concat('%','" + search_value + "','%') or equipment_alias like concat('%','" + search_value + "','%')) "; + } else if ("数据集名称".equals(search_type)) { + where += " and (dataset_name like concat('%','" + search_value + "','%')) "; + } else if ("数据样品类型".equals(search_type)) { + where += " and (data_type like concat('%','" + search_value + "','%') or data_alias like concat('%','" + search_value + "','%')) "; + } else if ("航次首席".equals(search_type)) { + where += " and voyage_officer like concat('%','" + search_value + "','%') "; + } + } + + if ("数据样品集".equals(return_type)) { + String sql = "select t.* from (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) t,voyage_reg y where y.tsy_id=t.voyage_id " + + where + " order by t.create_time desc"; + return new HmeAjax(this.mVoyage.pageBySql(group, start, limit, sql)); + } else { + // 航次 + String sql = "select t.* from voyage_reg t where tsy_id in (" + "select distinct t.voyage_id from sample_dataset t,voyage_reg y where y.tsy_id=t.voyage_id " + " " + where + ") order by t.create_time desc"; + return new HmeAjax(this.mVoyage.pageBySql(group, start, limit, sql)); + + } + + } } \ No newline at end of file diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/search/SearchParam.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/search/SearchParam.java index d37ccd5..8462586 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/search/SearchParam.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/search/SearchParam.java @@ -1,105 +1,105 @@ -package cn.tsy.cas.idsse.dsds.control.search; - -/************************* - * 查询参数 - * - * @author TsySoft - * @create 2024-10-01 15:31:19 - * @version 1.0.0 - * @email revisit@126.com - * - */ -public class SearchParam { - - /********************* - * 航次名称 - */ - private String voyage_name; - - /******************** - * 平台类型 - */ - private String platform_type; - - /****************** - * 平台名称 - */ - private String platform_name; - - /******************* - * 设备类型 - */ - private String equipment_type; - - /***************** - * 数据样品类型 - */ - private String data_type; - - /************************** - * 数据集名称 - */ - private String dataset_name; - - /********************** - * 航次首席 - */ - private String voyage_officer; - - public String getVoyage_name() { - return voyage_name; - } - - public void setVoyage_name(String voyage_name) { - this.voyage_name = voyage_name; - } - - public String getPlatform_type() { - return platform_type; - } - - public void setPlatform_type(String platform_type) { - this.platform_type = platform_type; - } - - public String getPlatform_name() { - return platform_name; - } - - public void setPlatform_name(String platform_name) { - this.platform_name = platform_name; - } - - public String getEquipment_type() { - return equipment_type; - } - - public void setEquipment_type(String equipment_type) { - this.equipment_type = equipment_type; - } - - public String getData_type() { - return data_type; - } - - public void setData_type(String data_type) { - this.data_type = data_type; - } - - public String getDataset_name() { - return dataset_name; - } - - public void setDataset_name(String dataset_name) { - this.dataset_name = dataset_name; - } - - public String getVoyage_officer() { - return voyage_officer; - } - - public void setVoyage_officer(String voyage_officer) { - this.voyage_officer = voyage_officer; - } - -} +package cn.tsy.cas.idsse.dsds.control.search; + +/************************* + * 查询参数 + * + * @author TsySoft + * @create 2024-10-01 15:31:19 + * @version 1.0.0 + * @email revisit@126.com + * + */ +public class SearchParam { + + /********************* + * 航次名称 + */ + private String voyage_name; + + /******************** + * 平台类型 + */ + private String platform_type; + + /****************** + * 平台名称 + */ + private String platform_name; + + /******************* + * 设备类型 + */ + private String equipment_type; + + /***************** + * 数据样品类型 + */ + private String data_type; + + /************************** + * 数据集名称 + */ + private String dataset_name; + + /********************** + * 航次首席 + */ + private String voyage_officer; + + public String getVoyage_name() { + return voyage_name; + } + + public void setVoyage_name(String voyage_name) { + this.voyage_name = voyage_name; + } + + public String getPlatform_type() { + return platform_type; + } + + public void setPlatform_type(String platform_type) { + this.platform_type = platform_type; + } + + public String getPlatform_name() { + return platform_name; + } + + public void setPlatform_name(String platform_name) { + this.platform_name = platform_name; + } + + public String getEquipment_type() { + return equipment_type; + } + + public void setEquipment_type(String equipment_type) { + this.equipment_type = equipment_type; + } + + public String getData_type() { + return data_type; + } + + public void setData_type(String data_type) { + this.data_type = data_type; + } + + public String getDataset_name() { + return dataset_name; + } + + public void setDataset_name(String dataset_name) { + this.dataset_name = dataset_name; + } + + public String getVoyage_officer() { + return voyage_officer; + } + + public void setVoyage_officer(String voyage_officer) { + this.voyage_officer = voyage_officer; + } + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageMemberControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageMemberControl.java index a733033..f003bdd 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageMemberControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageMemberControl.java @@ -1,102 +1,102 @@ -package cn.tsy.cas.idsse.dsds.control.voyage; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.helper.excel.HmeExcel2007Writer; -import cn.hme.framework.helper.excel.HmeExcelReaderHelper; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.cas.idsse.dsds.service.voyage.VoyageMemberService; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageMemberMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageMember; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; - -@RestController -@RequestMapping("voyage/member") -@CrossOrigin -public class VoyageMemberControl extends HmeAjaxControl { - - @Autowired - private IVoyageRegMapper mReg; - @Autowired - private IVoyageMemberMapper mMember; - - @Autowired - private VoyageMemberService sMember; - - @RequestMapping("page.htm") - public HmeAjax page(int voyage_id, Integer group, Integer limit, Integer start, String query, String order, String type) { - order = HmeStringHelper.hasValue(order) ? order : "tsy_id"; - Pageable page = this.mMember.memberWithPage(group, start, limit, query, order, type, voyage_id); - return new HmeAjax(page); - } - - @RequestMapping("edit.htm") - public HmeAjax edit(VoyageMember member) { - DSDSWebHelper.getFrameOptr(true); - this.sMember.editMember(member); - return new HmeAjax(); - } - - @RequestMapping("delete.htm") - public HmeAjax delete(int member_id) { - DSDSWebHelper.getFrameOptr(true); - this.sMember.deleteMember(member_id); - return new HmeAjax(); - } - - @RequestMapping("list.htm") - public HmeAjax list(int voyage_id) { - return new HmeAjax(this.mMember.listByColumn("voyage_id", voyage_id,"tsy_id")); - } - - - @CrossOrigin - @RequestMapping("upload.htm") - public HmeAjax upload(int voyage_id, MultipartFile file) { - DSDSWebHelper.getFrameOptr(true); - List> values = HmeExcelReaderHelper.readSheet(file,1, 12); - List list = this.sMember.uploadMember(voyage_id, values, DSDSWebHelper.getFrameOptr(true)); - if (list.size() == 0) - throw new BusinessException("未找到有效的参航人员记录！"); - return new HmeAjax(); - } - - @RequestMapping("download.htm") - public void download(int voyage_id) { - VoyageReg voyage = this.mReg.find(voyage_id); - List array = this.mMember.listByColumn("voyage_id", voyage_id, "tsy_id"); - // 姓名 性别 出生日期 单位 岗位职责 船上床号 联系电话 证件号码 银卡名称 银行卡号码 开户行 备注信息 - Map titleMap = HmeExcel2007Writer.createTitleMap("姓名", 20); - titleMap.put("性别", 8); - titleMap.put("出生日期", 14); - titleMap.put("单位", 30); - titleMap.put("岗位职责", 20); - - List> values = new ArrayList>(); - for(VoyageMember m:array) { - List vs = new ArrayList(); - vs.add(m.getMember_name()); - vs.add(m.getMember_sex()); - vs.add(m.getMember_birthday()); - vs.add(m.getMember_unit()); - vs.add(m.getMember_dept()); - values.add(vs); - } - HmeExcel2007Writer.downloadAsExcel(this.getResponse(),voyage.getVoyage_name() + "_参航人员名单",values, titleMap); - } - -} +package cn.tsy.cas.idsse.dsds.control.voyage; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.helper.excel.HmeExcel2007Writer; +import cn.hme.framework.helper.excel.HmeExcelReaderHelper; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.cas.idsse.dsds.service.voyage.VoyageMemberService; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageMemberMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageMember; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; + +@RestController +@RequestMapping("voyage/member") +@CrossOrigin +public class VoyageMemberControl extends HmeAjaxControl { + + @Autowired + private IVoyageRegMapper mReg; + @Autowired + private IVoyageMemberMapper mMember; + + @Autowired + private VoyageMemberService sMember; + + @RequestMapping("page.htm") + public HmeAjax page(int voyage_id, Integer group, Integer limit, Integer start, String query, String order, String type) { + order = HmeStringHelper.hasValue(order) ? order : "tsy_id"; + Pageable page = this.mMember.memberWithPage(group, start, limit, query, order, type, voyage_id); + return new HmeAjax(page); + } + + @RequestMapping("edit.htm") + public HmeAjax edit(VoyageMember member) { + DSDSWebHelper.getFrameOptr(true); + this.sMember.editMember(member); + return new HmeAjax(); + } + + @RequestMapping("delete.htm") + public HmeAjax delete(int member_id) { + DSDSWebHelper.getFrameOptr(true); + this.sMember.deleteMember(member_id); + return new HmeAjax(); + } + + @RequestMapping("list.htm") + public HmeAjax list(int voyage_id) { + return new HmeAjax(this.mMember.listByColumn("voyage_id", voyage_id,"tsy_id")); + } + + + @CrossOrigin + @RequestMapping("upload.htm") + public HmeAjax upload(int voyage_id, MultipartFile file) { + DSDSWebHelper.getFrameOptr(true); + List> values = HmeExcelReaderHelper.readSheet(file,1, 12); + List list = this.sMember.uploadMember(voyage_id, values, DSDSWebHelper.getFrameOptr(true)); + if (list.size() == 0) + throw new BusinessException("未找到有效的参航人员记录！"); + return new HmeAjax(); + } + + @RequestMapping("download.htm") + public void download(int voyage_id) { + VoyageReg voyage = this.mReg.find(voyage_id); + List array = this.mMember.listByColumn("voyage_id", voyage_id, "tsy_id"); + // 姓名 性别 出生日期 单位 岗位职责 船上床号 联系电话 证件号码 银卡名称 银行卡号码 开户行 备注信息 + Map titleMap = HmeExcel2007Writer.createTitleMap("姓名", 20); + titleMap.put("性别", 8); + titleMap.put("出生日期", 14); + titleMap.put("单位", 30); + titleMap.put("岗位职责", 20); + + List> values = new ArrayList>(); + for(VoyageMember m:array) { + List vs = new ArrayList(); + vs.add(m.getMember_name()); + vs.add(m.getMember_sex()); + vs.add(m.getMember_birthday()); + vs.add(m.getMember_unit()); + vs.add(m.getMember_dept()); + values.add(vs); + } + HmeExcel2007Writer.downloadAsExcel(this.getResponse(),voyage.getVoyage_name() + "_参航人员名单",values, titleMap); + } + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageNavigationControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageNavigationControl.java index 9e0b353..4390258 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageNavigationControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageNavigationControl.java @@ -1,118 +1,118 @@ -package cn.tsy.cas.idsse.dsds.control.voyage; - -import java.io.File; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.frame.helper.HmeWebHelper; -import cn.hme.framework.helper.io.HmeFileHelper; -import cn.hme.framework.helper.io.HmeMultipartFileHelper; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.helper.time.HmeLocalDateHelper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.hme.framework.jdbc.entity.SqlQuery; -import cn.tsy.cas.idsse.dsds.helper.DSDSGeoCalculator; -import cn.tsy.cas.idsse.dsds.helper.DSDSParamHelper; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.cas.idsse.dsds.service.voyage.VoyageNavigationService; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageNavigationMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageNavigation; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; - -@RestController -@RequestMapping("voyage/navigation") -@CrossOrigin -public class VoyageNavigationControl extends HmeAjaxControl { - - @Autowired - private IVoyageRegMapper mReg; - @Autowired - private IVoyageNavigationMapper mNavigation; - - @Autowired - private VoyageNavigationService sNav; - - @RequestMapping("page.htm") - public HmeAjax page(int voyage_id, Integer group, Integer limit, Integer start, String query, String order, String type) { - order = HmeStringHelper.hasValue(order) ? order : "nav_time"; - Pageable page = this.mNavigation.navigationWithPage(group, start, limit, query, order, type, voyage_id); - return new HmeAjax(page); - } - - @RequestMapping("list.htm") - public HmeAjax list(int voyage_id) { - //return new HmeAjax(this.mNavigation.selectListByColumnAndSimpleOrder("voyage_id", voyage_id, OrderBy.of("nav_time"))); - return new HmeAjax(this.mNavigation.listNavigation(voyage_id, DSDSParamHelper.VaoyageNaviagtionTicketMinutes)); - } - - @RequestMapping("mileage.htm") - public HmeAjax mileage(int voyage_id) { - Double value = DSDSGeoCalculator.calcuateVoyage( - this.mNavigation.listByColumn("voyage_id", voyage_id, "nav_time")); - if(value!=null && value>0) { - VoyageReg voyage = new VoyageReg(); - voyage.setTsy_id(voyage_id); - voyage.setVoyage_mileage(value.intValue()); - this.mReg.update(voyage); - - } - return new HmeAjax(); - } - - @RequestMapping("total.htm") - public HmeAjax total(int voyage_id) { - Map value = this.mNavigation.totalNavigation(voyage_id); - Map mapReturn = new HashMap<>(); - if(value==null) - return new HmeAjax(mapReturn); - VoyageNavigation start = this.mNavigation.list(SqlQuery.create().addCondition("voyage_id", voyage_id) - .addCondition("nav_time", value.get("min_time"))).get(0); - VoyageNavigation end = this.mNavigation.list(SqlQuery.create().addCondition("voyage_id", voyage_id) - .addCondition("nav_time", value.get("max_time"))).get(0); - mapReturn.put("start", start); - mapReturn.put("end", end); - return new HmeAjax(mapReturn); - } - - @CrossOrigin - @RequestMapping("upload.htm") - public HmeAjax upload(int voyage_id, MultipartFile file) { - DSDSWebHelper.getFrameOptr(true); - File f = HmeMultipartFileHelper.fromUpload(file); - List array = HmeFileHelper.readAsArray(f.getPath()); - f.delete(); - List list = this.sNav.uploadNavigation(voyage_id, array,file.getOriginalFilename(), DSDSWebHelper.getFrameOptr(true)); - if (list.size() == 0) - throw new BusinessException("未找到有效的导航记录(已忽略相同的记录)！"); - return new HmeAjax(file.getOriginalFilename()); - } - - @RequestMapping("download.htm") - public void download(int voyage_id) { - VoyageReg voyage = this.mReg.find(voyage_id); - List array = this.mNavigation.listByColumn("voyage_id", voyage_id, "nav_time"); - List values = new ArrayList<>(); - for (VoyageNavigation nav : array) { - values.add(nav.getNav_lon() + " " + nav.getNav_lat() + " " + HmeLocalDateHelper.format(nav.getNav_time()).replace(" ", "-")); - } - File tmpFile = HmeFileHelper.createTempFile(); - HmeFileHelper.writeFile(tmpFile, values); - // TS2-29-1_0918-1007 - DateTimeFormatter ft = DateTimeFormatter.ofPattern("MMdd"); - HmeWebHelper.downloadFile(tmpFile, voyage.getVoyage_name() + "_" + voyage.getVoyage_start_date().format(ft) + "-" + voyage.getVoyage_end_date().format(ft)+".txt", true); - } - -} +package cn.tsy.cas.idsse.dsds.control.voyage; + +import java.io.File; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.frame.helper.HmeWebHelper; +import cn.hme.framework.helper.io.HmeFileHelper; +import cn.hme.framework.helper.io.HmeMultipartFileHelper; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.helper.time.HmeLocalDateHelper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.hme.framework.jdbc.entity.SqlQuery; +import cn.tsy.cas.idsse.dsds.helper.DSDSGeoCalculator; +import cn.tsy.cas.idsse.dsds.helper.DSDSParamHelper; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.cas.idsse.dsds.service.voyage.VoyageNavigationService; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageNavigationMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageNavigation; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; + +@RestController +@RequestMapping("voyage/navigation") +@CrossOrigin +public class VoyageNavigationControl extends HmeAjaxControl { + + @Autowired + private IVoyageRegMapper mReg; + @Autowired + private IVoyageNavigationMapper mNavigation; + + @Autowired + private VoyageNavigationService sNav; + + @RequestMapping("page.htm") + public HmeAjax page(int voyage_id, Integer group, Integer limit, Integer start, String query, String order, String type) { + order = HmeStringHelper.hasValue(order) ? order : "nav_time"; + Pageable page = this.mNavigation.navigationWithPage(group, start, limit, query, order, type, voyage_id); + return new HmeAjax(page); + } + + @RequestMapping("list.htm") + public HmeAjax list(int voyage_id) { + //return new HmeAjax(this.mNavigation.selectListByColumnAndSimpleOrder("voyage_id", voyage_id, OrderBy.of("nav_time"))); + return new HmeAjax(this.mNavigation.listNavigation(voyage_id, DSDSParamHelper.VaoyageNaviagtionTicketMinutes)); + } + + @RequestMapping("mileage.htm") + public HmeAjax mileage(int voyage_id) { + Double value = DSDSGeoCalculator.calcuateVoyage( + this.mNavigation.listByColumn("voyage_id", voyage_id, "nav_time")); + if(value!=null && value>0) { + VoyageReg voyage = new VoyageReg(); + voyage.setTsy_id(voyage_id); + voyage.setVoyage_mileage(value.intValue()); + this.mReg.update(voyage); + + } + return new HmeAjax(); + } + + @RequestMapping("total.htm") + public HmeAjax total(int voyage_id) { + Map value = this.mNavigation.totalNavigation(voyage_id); + Map mapReturn = new HashMap<>(); + if(value==null) + return new HmeAjax(mapReturn); + VoyageNavigation start = this.mNavigation.list(SqlQuery.create().addCondition("voyage_id", voyage_id) + .addCondition("nav_time", value.get("min_time"))).get(0); + VoyageNavigation end = this.mNavigation.list(SqlQuery.create().addCondition("voyage_id", voyage_id) + .addCondition("nav_time", value.get("max_time"))).get(0); + mapReturn.put("start", start); + mapReturn.put("end", end); + return new HmeAjax(mapReturn); + } + + @CrossOrigin + @RequestMapping("upload.htm") + public HmeAjax upload(int voyage_id, MultipartFile file) { + DSDSWebHelper.getFrameOptr(true); + File f = HmeMultipartFileHelper.fromUpload(file); + List array = HmeFileHelper.readAsArray(f.getPath()); + f.delete(); + List list = this.sNav.uploadNavigation(voyage_id, array,file.getOriginalFilename(), DSDSWebHelper.getFrameOptr(true)); + if (list.size() == 0) + throw new BusinessException("未找到有效的导航记录(已忽略相同的记录)！"); + return new HmeAjax(file.getOriginalFilename()); + } + + @RequestMapping("download.htm") + public void download(int voyage_id) { + VoyageReg voyage = this.mReg.find(voyage_id); + List array = this.mNavigation.listByColumn("voyage_id", voyage_id, "nav_time"); + List values = new ArrayList<>(); + for (VoyageNavigation nav : array) { + values.add(nav.getNav_lon() + " " + nav.getNav_lat() + " " + HmeLocalDateHelper.format(nav.getNav_time()).replace(" ", "-")); + } + File tmpFile = HmeFileHelper.createTempFile(); + HmeFileHelper.writeFile(tmpFile, values); + // TS2-29-1_0918-1007 + DateTimeFormatter ft = DateTimeFormatter.ofPattern("MMdd"); + HmeWebHelper.downloadFile(tmpFile, voyage.getVoyage_name() + "_" + voyage.getVoyage_start_date().format(ft) + "-" + voyage.getVoyage_end_date().format(ft)+".txt", true); + } + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageRegControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageRegControl.java index aeb2915..bfe162f 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageRegControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageRegControl.java @@ -1,95 +1,95 @@ -package cn.tsy.cas.idsse.dsds.control.voyage; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import cn.hme.data.frame.model.HmeFrameOptr; -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.helper.excel.HmeExcelReaderHelper; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.cas.idsse.dsds.service.voyage.VoyageRegService; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageMemberMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; - -@RestController -@RequestMapping("voyage/reg") -@CrossOrigin -public class VoyageRegControl extends HmeAjaxControl { - - @Autowired - private IVoyageRegMapper mVoyage; - - @Autowired - private VoyageRegService sVoyage; - @Autowired - private IVoyageMemberMapper mMember; - - @CrossOrigin - @RequestMapping("page.htm") - public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { - order = HmeStringHelper.hasValue(order) ? order : "voyage_end_date"; - type = HmeStringHelper.hasValue(type) ? type : "DESC"; - HmeFrameOptr optr = DSDSWebHelper.getFrameOptr(false); - Pageable page = this.mVoyage.voyageWithPage(group, start, limit, query, order, type, - optr == null ? null : optr.getRole_id(), optr == null ? null : optr.getOptr_id()); - return new HmeAjax(page); - } - - @RequestMapping("edit.htm") - public HmeAjax edit(VoyageReg voyage) { - this.sVoyage.editVoyage(voyage, DSDSWebHelper.getFrameOptr(true)); - return new HmeAjax(voyage); - } - - @CrossOrigin - @RequestMapping("list.htm") - public HmeAjax list() { - return new HmeAjax(this.mVoyage.all("voyage_name")); - } - - @RequestMapping("upload.htm") - public HmeAjax upload(MultipartFile file) { - // DSDSWebHelper.getFrameOptr(true); - List> values = HmeExcelReaderHelper.readSheet(file, 1, 40); - if (values.size() == 0) - throw new BusinessException("导入的文件中无有效数据，请检查！"); - return new HmeAjax(this.sVoyage.uploadVoyage(values).size()); - } - - @RequestMapping("info.htm") - public HmeAjax info(String voyage_name) { - VoyageReg voyage = this.mVoyage.findByColumn("voyage_name", voyage_name); - Map mapReturn = new HashMap<>(); - mapReturn.put("voyage", voyage); - String sql = "select platform_type,platform_alias,platform_name,count(1) platform_total from sample_dataset where voyage_id=? group by platform_type,platform_alias,platform_name order by count(1) desc"; - mapReturn.put("PlatformArray", this.mVoyage.mapBySql(sql, voyage.getTsy_id())); - sql = "select equipment_type,equipment_alias,count(1) equipment_total from sample_dataset where voyage_id=? group by equipment_type,equipment_alias order by count(1) desc"; - mapReturn.put("EquipmentArray", this.mVoyage.mapBySql(sql, voyage.getTsy_id())); - sql = "select dataset_name,platform_type,platform_alias,equipment_type,equipment_alias,count(1) data_total,data_type,data_alias,job_type from sample_dataset where voyage_id=? group by platform_type,platform_alias,equipment_type,equipment_alias,dataset_name,data_type,data_alias,job_type order by count(1) desc"; - mapReturn.put("DatasetArray", this.mVoyage.mapBySql(sql, voyage.getTsy_id())); - mapReturn.put("MemberArray", this.mMember.listByColumn("voyage_id", voyage.getTsy_id(), "tsy_id")); - HmeAjax HmeAjax = new HmeAjax(); - HmeAjax.setMap(mapReturn); - return HmeAjax; - } - - @RequestMapping("delete.htm") - public HmeAjax delete(int tsy_id) { - DSDSWebHelper.getFrameOptr(true); - this.sVoyage.deleteVoyage(tsy_id); - return new HmeAjax(); - } - -} +package cn.tsy.cas.idsse.dsds.control.voyage; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import cn.hme.data.frame.model.HmeFrameOptr; +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.helper.excel.HmeExcelReaderHelper; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.cas.idsse.dsds.service.voyage.VoyageRegService; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageMemberMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; + +@RestController +@RequestMapping("voyage/reg") +@CrossOrigin +public class VoyageRegControl extends HmeAjaxControl { + + @Autowired + private IVoyageRegMapper mVoyage; + + @Autowired + private VoyageRegService sVoyage; + @Autowired + private IVoyageMemberMapper mMember; + + @CrossOrigin + @RequestMapping("page.htm") + public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type) { + order = HmeStringHelper.hasValue(order) ? order : "voyage_end_date"; + type = HmeStringHelper.hasValue(type) ? type : "DESC"; + HmeFrameOptr optr = DSDSWebHelper.getFrameOptr(false); + Pageable page = this.mVoyage.voyageWithPage(group, start, limit, query, order, type, + optr == null ? null : optr.getRole_id(), optr == null ? null : optr.getOptr_id()); + return new HmeAjax(page); + } + + @RequestMapping("edit.htm") + public HmeAjax edit(VoyageReg voyage) { + this.sVoyage.editVoyage(voyage, DSDSWebHelper.getFrameOptr(true)); + return new HmeAjax(voyage); + } + + @CrossOrigin + @RequestMapping("list.htm") + public HmeAjax list() { + return new HmeAjax(this.mVoyage.all("voyage_name")); + } + + @RequestMapping("upload.htm") + public HmeAjax upload(MultipartFile file) { + // DSDSWebHelper.getFrameOptr(true); + List> values = HmeExcelReaderHelper.readSheet(file, 1, 40); + if (values.size() == 0) + throw new BusinessException("导入的文件中无有效数据，请检查！"); + return new HmeAjax(this.sVoyage.uploadVoyage(values).size()); + } + + @RequestMapping("info.htm") + public HmeAjax info(String voyage_name) { + VoyageReg voyage = this.mVoyage.findByColumn("voyage_name", voyage_name); + Map mapReturn = new HashMap<>(); + mapReturn.put("voyage", voyage); + String sql = "select platform_type,platform_alias,platform_name,count(1) platform_total from sample_dataset where voyage_id=? group by platform_type,platform_alias,platform_name order by count(1) desc"; + mapReturn.put("PlatformArray", this.mVoyage.mapBySql(sql, voyage.getTsy_id())); + sql = "select equipment_type,equipment_alias,count(1) equipment_total from sample_dataset where voyage_id=? group by equipment_type,equipment_alias order by count(1) desc"; + mapReturn.put("EquipmentArray", this.mVoyage.mapBySql(sql, voyage.getTsy_id())); + sql = "select dataset_name,platform_type,platform_alias,equipment_type,equipment_alias,count(1) data_total,data_type,data_alias,job_type from sample_dataset where voyage_id=? group by platform_type,platform_alias,equipment_type,equipment_alias,dataset_name,data_type,data_alias,job_type order by count(1) desc"; + mapReturn.put("DatasetArray", this.mVoyage.mapBySql(sql, voyage.getTsy_id())); + mapReturn.put("MemberArray", this.mMember.listByColumn("voyage_id", voyage.getTsy_id(), "tsy_id")); + HmeAjax HmeAjax = new HmeAjax(); + HmeAjax.setMap(mapReturn); + return HmeAjax; + } + + @RequestMapping("delete.htm") + public HmeAjax delete(int tsy_id) { + DSDSWebHelper.getFrameOptr(true); + this.sVoyage.deleteVoyage(tsy_id); + return new HmeAjax(); + } + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageRegOptrControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageRegOptrControl.java index 7501ac8..eac1d41 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageRegOptrControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/voyage/VoyageRegOptrControl.java @@ -1,44 +1,44 @@ -package cn.tsy.cas.idsse.dsds.control.voyage; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; -import cn.tsy.cas.idsse.dsds.service.voyage.VoyageRegOptrService; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegOptrMapper; - -@RestController -@RequestMapping("voyage/reg/optr") -@CrossOrigin -public class VoyageRegOptrControl extends HmeAjaxControl { - - @Autowired - private IVoyageRegOptrMapper iOptr; - - @Autowired - private VoyageRegOptrService sVoyage; - - @RequestMapping("list.htm") - public HmeAjax list(int optr_id) { - return new HmeAjax(this.iOptr.listVoyage(optr_id)); - } - - @RequestMapping("grant.htm") - public HmeAjax edit(int optr_id, Integer voyage_ids[]) { - DSDSWebHelper.getFrameOptr(true); - this.sVoyage.save(optr_id, voyage_ids); - return new HmeAjax(this.iOptr.listVoyage(optr_id)); - } - - @RequestMapping("clear.htm") - public HmeAjax edit(int optr_id) { - DSDSWebHelper.getFrameOptr(true); - this.sVoyage.clear(optr_id); - return new HmeAjax(); - } - -} +package cn.tsy.cas.idsse.dsds.control.voyage; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; +import cn.tsy.cas.idsse.dsds.service.voyage.VoyageRegOptrService; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegOptrMapper; + +@RestController +@RequestMapping("voyage/reg/optr") +@CrossOrigin +public class VoyageRegOptrControl extends HmeAjaxControl { + + @Autowired + private IVoyageRegOptrMapper iOptr; + + @Autowired + private VoyageRegOptrService sVoyage; + + @RequestMapping("list.htm") + public HmeAjax list(int optr_id) { + return new HmeAjax(this.iOptr.listVoyage(optr_id)); + } + + @RequestMapping("grant.htm") + public HmeAjax edit(int optr_id, Integer voyage_ids[]) { + DSDSWebHelper.getFrameOptr(true); + this.sVoyage.save(optr_id, voyage_ids); + return new HmeAjax(this.iOptr.listVoyage(optr_id)); + } + + @RequestMapping("clear.htm") + public HmeAjax edit(int optr_id) { + DSDSWebHelper.getFrameOptr(true); + this.sVoyage.clear(optr_id); + return new HmeAjax(); + } + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/helper/DSDSGeoCalculator.java b/src/main/java/cn/tsy/cas/idsse/dsds/helper/DSDSGeoCalculator.java index eb1963b..17c613d 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/helper/DSDSGeoCalculator.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/helper/DSDSGeoCalculator.java @@ -1,53 +1,53 @@ -package cn.tsy.cas.idsse.dsds.helper; - -import java.util.List; - -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageNavigation; - -public class DSDSGeoCalculator { - - // 地球半径，单位为海里 - private static final double EARTH_RADIUS = 3440; - - /** - * 计算两点之间的距离，结果以海里为单位 - * - * @param lat1 第一个点的纬度 - * @param lon1 第一个点的经度 - * @param lat2 第二个点的纬度 - * @param lon2 第二个点的经度 - * @return 两点之间的距离，单位为海里 - */ - public static double calculateDistanceInNauticalMiles(double lat1, double lon1, double lat2, double lon2) { - double latDistance = Math.toRadians(lat2 - lat1); - double lonDistance = Math.toRadians(lon2 - lon1); - double a = Math.sin(latDistance / 2) * Math.sin(latDistance / 2) + Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2)) * Math.sin(lonDistance / 2) * Math.sin(lonDistance / 2); - double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); - double distance = EARTH_RADIUS * c; - return distance; - } - - public static double calcuateVoyage(List list) { - if (list.size() < 2) - return 0d; - double distance = 0; - for (int i = 0; i < list.size()-1; i++) { - distance += calculateDistanceInNauticalMiles(Double.parseDouble(list.get(i).getNav_lat()), - Double.parseDouble(list.get(i).getNav_lon()), - Double.parseDouble(list.get(i+1).getNav_lat()), - Double.parseDouble(list.get(i+1).getNav_lon())); - } - return distance; - } - -// public static void main(String[] args) { -// // 示例经纬度 -// double lat1 = 40.7128; -// double lon1 = -74.0060; -// double lat2 = 40.7829; -// double lon2 = -73.9654; -// -// double distance = calculateDistanceInNauticalMiles(lat1, lon1, lat2, lon2); -// System.out.println("Distance in nautical miles: " + distance); -// } -} +package cn.tsy.cas.idsse.dsds.helper; + +import java.util.List; + +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageNavigation; + +public class DSDSGeoCalculator { + + // 地球半径，单位为海里 + private static final double EARTH_RADIUS = 3440; + + /** + * 计算两点之间的距离，结果以海里为单位 + * + * @param lat1 第一个点的纬度 + * @param lon1 第一个点的经度 + * @param lat2 第二个点的纬度 + * @param lon2 第二个点的经度 + * @return 两点之间的距离，单位为海里 + */ + public static double calculateDistanceInNauticalMiles(double lat1, double lon1, double lat2, double lon2) { + double latDistance = Math.toRadians(lat2 - lat1); + double lonDistance = Math.toRadians(lon2 - lon1); + double a = Math.sin(latDistance / 2) * Math.sin(latDistance / 2) + Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2)) * Math.sin(lonDistance / 2) * Math.sin(lonDistance / 2); + double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); + double distance = EARTH_RADIUS * c; + return distance; + } + + public static double calcuateVoyage(List list) { + if (list.size() < 2) + return 0d; + double distance = 0; + for (int i = 0; i < list.size()-1; i++) { + distance += calculateDistanceInNauticalMiles(Double.parseDouble(list.get(i).getNav_lat()), + Double.parseDouble(list.get(i).getNav_lon()), + Double.parseDouble(list.get(i+1).getNav_lat()), + Double.parseDouble(list.get(i+1).getNav_lon())); + } + return distance; + } + +// public static void main(String[] args) { +// // 示例经纬度 +// double lat1 = 40.7128; +// double lon1 = -74.0060; +// double lat2 = 40.7829; +// double lon2 = -73.9654; +// +// double distance = calculateDistanceInNauticalMiles(lat1, lon1, lat2, lon2); +// System.out.println("Distance in nautical miles: " + distance); +// } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/helper/DSDSParamHelper.java b/src/main/java/cn/tsy/cas/idsse/dsds/helper/DSDSParamHelper.java index ff33faf..5a6b461 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/helper/DSDSParamHelper.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/helper/DSDSParamHelper.java @@ -1,17 +1,17 @@ -package cn.tsy.cas.idsse.dsds.helper; - -public class DSDSParamHelper { - - /**************** - * 航次间隔时间（单位分钟） - */ - public static int VaoyageNaviagtionTicketMinutes = 5; - /**************** - * 航次间隔时间（单位分钟） - */ - public static int DatasetNaviagtionTicketMinutes = 1; - /**************** - * 首页统计时间间隔，单位秒 - */ - public static int ReportMainTicketSeconds = 5 * 60; -} +package cn.tsy.cas.idsse.dsds.helper; + +public class DSDSParamHelper { + + /**************** + * 航次间隔时间（单位分钟） + */ + public static int VaoyageNaviagtionTicketMinutes = 5; + /**************** + * 航次间隔时间（单位分钟） + */ + public static int DatasetNaviagtionTicketMinutes = 1; + /**************** + * 首页统计时间间隔，单位秒 + */ + public static int ReportMainTicketSeconds = 5 * 60; +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/helper/DSDSWebHelper.java b/src/main/java/cn/tsy/cas/idsse/dsds/helper/DSDSWebHelper.java index 7ee13e7..ff5a246 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/helper/DSDSWebHelper.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/helper/DSDSWebHelper.java @@ -1,31 +1,31 @@ -package cn.tsy.cas.idsse.dsds.helper; - -import cn.hme.data.frame.mapper.IHmeFrameOptrMapper; -import cn.hme.data.frame.model.HmeFrameOptr; -import cn.hme.framework.frame.helper.HmeWebHelper; -import cn.hme.framework.helper.core.HmeSpringHelper; -import cn.hme.framework.web.context.HmeWebAppParamerter; -import cn.hme.framework.web.exception.LoginTimeoutException; - -public class DSDSWebHelper { - /******************* - * 获取系统操作员，并根据参数选择是否进行判断 - */ - public static HmeFrameOptr getFrameOptr(boolean check) { - HmeFrameOptr optr = null; - try { - optr = (HmeFrameOptr) HmeWebHelper.getSession().getAttribute(HmeWebAppParamerter.SessionName_OptrName); - } catch (Exception e) { - } - if (check && optr == null) { - if (HmeWebAppParamerter.AutoLoginWithAdmin) { - optr = HmeSpringHelper.getBean(IHmeFrameOptrMapper.class).find(1); - HmeWebHelper.getSession().setAttribute(HmeWebAppParamerter.SessionName_OptrName, optr); - } - else - throw new LoginTimeoutException(); - } - - return optr; - } -} +package cn.tsy.cas.idsse.dsds.helper; + +import cn.hme.data.frame.mapper.IHmeFrameOptrMapper; +import cn.hme.data.frame.model.HmeFrameOptr; +import cn.hme.framework.frame.helper.HmeWebHelper; +import cn.hme.framework.helper.core.HmeSpringHelper; +import cn.hme.framework.web.context.HmeWebAppParamerter; +import cn.hme.framework.web.exception.LoginTimeoutException; + +public class DSDSWebHelper { + /******************* + * 获取系统操作员，并根据参数选择是否进行判断 + */ + public static HmeFrameOptr getFrameOptr(boolean check) { + HmeFrameOptr optr = null; + try { + optr = (HmeFrameOptr) HmeWebHelper.getSession().getAttribute(HmeWebAppParamerter.SessionName_OptrName); + } catch (Exception e) { + } + if (check && optr == null) { + if (HmeWebAppParamerter.AutoLoginWithAdmin) { + optr = HmeSpringHelper.getBean(IHmeFrameOptrMapper.class).find(1); + HmeWebHelper.getSession().setAttribute(HmeWebAppParamerter.SessionName_OptrName, optr); + } + else + throw new LoginTimeoutException(); + } + + return optr; + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictDataService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictDataService.java index eaec42c..4c6949f 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictDataService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictDataService.java @@ -1,47 +1,47 @@ -package cn.tsy.cas.idsse.dsds.service.dict; - -import java.time.LocalDateTime; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.helper.HmeFrameAssertHelper; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictDataMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictData; - -@Service -public class DictDataService { - - @Autowired - private IDictDataMapper mData; - - /*********************** - * 增加或者修改 - */ - public void editData(DictData data) { - HmeFrameAssertHelper.isNotEmpty(data.getData_name(), "数据样本类型名称不允许为空！"); - // 判断类型是否存在 - List list = this.mData.listByColumn("data_name", data.getData_name()); - if (data.getTsy_id() != null) { - if (list.size() > 0 && list.get(0).getTsy_id() - data.getTsy_id() != 0) - throw new BusinessException("数据样本类型名称【" + data.getData_name() + "】已经存在，请检查！"); - this.mData.update(data); - } else { - HmeFrameAssertHelper.isEmpty(list, "数据样本类型名称【" + data.getData_name() + "】已经存在，请检查！"); - data.setCreate_time(LocalDateTime.now()); - this.mData.insert(data); - } - } - - /***************************** - * 删除， - */ - public void deleteData(int data_id) { - /************** - * @todo 需要去判断是否真的可以删除 - */ - this.mData.delete(data_id); - } -} +package cn.tsy.cas.idsse.dsds.service.dict; + +import java.time.LocalDateTime; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.helper.HmeFrameAssertHelper; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictDataMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictData; + +@Service +public class DictDataService { + + @Autowired + private IDictDataMapper mData; + + /*********************** + * 增加或者修改 + */ + public void editData(DictData data) { + HmeFrameAssertHelper.isNotEmpty(data.getData_name(), "数据样本类型名称不允许为空！"); + // 判断类型是否存在 + List list = this.mData.listByColumn("data_name", data.getData_name()); + if (data.getTsy_id() != null) { + if (list.size() > 0 && list.get(0).getTsy_id() - data.getTsy_id() != 0) + throw new BusinessException("数据样本类型名称【" + data.getData_name() + "】已经存在，请检查！"); + this.mData.update(data); + } else { + HmeFrameAssertHelper.isEmpty(list, "数据样本类型名称【" + data.getData_name() + "】已经存在，请检查！"); + data.setCreate_time(LocalDateTime.now()); + this.mData.insert(data); + } + } + + /***************************** + * 删除， + */ + public void deleteData(int data_id) { + /************** + * @todo 需要去判断是否真的可以删除 + */ + this.mData.delete(data_id); + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictEquipmentService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictEquipmentService.java index 77f6a73..edae8cc 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictEquipmentService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictEquipmentService.java @@ -1,47 +1,47 @@ -package cn.tsy.cas.idsse.dsds.service.dict; - -import java.time.LocalDateTime; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.helper.HmeFrameAssertHelper; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictEquipmentMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictEquipment; - -@Service -public class DictEquipmentService { - - @Autowired - private IDictEquipmentMapper mEquipment; - - /*********************** - * 增加或者修改 - */ - public void editEquipment(DictEquipment equipment) { - HmeFrameAssertHelper.isNotEmpty(equipment.getEquipment_name(), "设备类型名称不允许为空！"); - // 判断类型是否存在 - List list = this.mEquipment.listByColumn("equipment_name", equipment.getEquipment_name()); - if (equipment.getTsy_id() != null) { - if (list.size() > 0 && list.get(0).getTsy_id() - equipment.getTsy_id() != 0) - throw new BusinessException("设备类型名称【" + equipment.getEquipment_name() + "】已经存在，请检查！"); - this.mEquipment.update(equipment); - } else { - HmeFrameAssertHelper.isEmpty(list, "设备类型名称【" + equipment.getEquipment_name() + "】已经存在，请检查！"); - equipment.setCreate_time(LocalDateTime.now()); - this.mEquipment.insert(equipment); - } - } - - /***************************** - * 删除， - */ - public void deleteEquipment(int equipment_id) { - /************** - * @todo 需要去判断是否真的可以删除 - */ - this.mEquipment.delete(equipment_id); - } -} +package cn.tsy.cas.idsse.dsds.service.dict; + +import java.time.LocalDateTime; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.helper.HmeFrameAssertHelper; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictEquipmentMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictEquipment; + +@Service +public class DictEquipmentService { + + @Autowired + private IDictEquipmentMapper mEquipment; + + /*********************** + * 增加或者修改 + */ + public void editEquipment(DictEquipment equipment) { + HmeFrameAssertHelper.isNotEmpty(equipment.getEquipment_name(), "设备类型名称不允许为空！"); + // 判断类型是否存在 + List list = this.mEquipment.listByColumn("equipment_name", equipment.getEquipment_name()); + if (equipment.getTsy_id() != null) { + if (list.size() > 0 && list.get(0).getTsy_id() - equipment.getTsy_id() != 0) + throw new BusinessException("设备类型名称【" + equipment.getEquipment_name() + "】已经存在，请检查！"); + this.mEquipment.update(equipment); + } else { + HmeFrameAssertHelper.isEmpty(list, "设备类型名称【" + equipment.getEquipment_name() + "】已经存在，请检查！"); + equipment.setCreate_time(LocalDateTime.now()); + this.mEquipment.insert(equipment); + } + } + + /***************************** + * 删除， + */ + public void deleteEquipment(int equipment_id) { + /************** + * @todo 需要去判断是否真的可以删除 + */ + this.mEquipment.delete(equipment_id); + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictFundingService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictFundingService.java index 19ef173..bba57cf 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictFundingService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictFundingService.java @@ -1,47 +1,47 @@ -package cn.tsy.cas.idsse.dsds.service.dict; - -import java.time.LocalDateTime; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.helper.HmeFrameAssertHelper; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictFundingMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictFunding; - -@Service -public class DictFundingService { - - @Autowired - private IDictFundingMapper mFunding; - - /*********************** - * 增加或者修改 - */ - public void editFunding(DictFunding funding) { - HmeFrameAssertHelper.isNotEmpty(funding.getFunding_name(), "资助机构名称不允许为空！"); - // 判断类型是否存在 - List list = this.mFunding.listByColumn("funding_name", funding.getFunding_name()); - if (funding.getTsy_id() != null) { - if (list.size() > 0 && list.get(0).getTsy_id() - funding.getTsy_id() != 0) - throw new BusinessException("资助机构名称【" + funding.getFunding_name() + "】已经存在，请检查！"); - this.mFunding.update(funding); - } else { - HmeFrameAssertHelper.isEmpty(list, "资助机构名称【" + funding.getFunding_name() + "】已经存在，请检查！"); - funding.setCreate_time(LocalDateTime.now()); - this.mFunding.insert(funding); - } - } - - /***************************** - * 删除， - */ - public void deleteFunding(int funding_id) { - /************** - * @todo 需要去判断是否真的可以删除 - */ - this.mFunding.delete(funding_id); - } -} +package cn.tsy.cas.idsse.dsds.service.dict; + +import java.time.LocalDateTime; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.helper.HmeFrameAssertHelper; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictFundingMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictFunding; + +@Service +public class DictFundingService { + + @Autowired + private IDictFundingMapper mFunding; + + /*********************** + * 增加或者修改 + */ + public void editFunding(DictFunding funding) { + HmeFrameAssertHelper.isNotEmpty(funding.getFunding_name(), "资助机构名称不允许为空！"); + // 判断类型是否存在 + List list = this.mFunding.listByColumn("funding_name", funding.getFunding_name()); + if (funding.getTsy_id() != null) { + if (list.size() > 0 && list.get(0).getTsy_id() - funding.getTsy_id() != 0) + throw new BusinessException("资助机构名称【" + funding.getFunding_name() + "】已经存在，请检查！"); + this.mFunding.update(funding); + } else { + HmeFrameAssertHelper.isEmpty(list, "资助机构名称【" + funding.getFunding_name() + "】已经存在，请检查！"); + funding.setCreate_time(LocalDateTime.now()); + this.mFunding.insert(funding); + } + } + + /***************************** + * 删除， + */ + public void deleteFunding(int funding_id) { + /************** + * @todo 需要去判断是否真的可以删除 + */ + this.mFunding.delete(funding_id); + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictPlatformService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictPlatformService.java index a6b82b4..0fc7413 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictPlatformService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictPlatformService.java @@ -1,48 +1,48 @@ -package cn.tsy.cas.idsse.dsds.service.dict; - -import java.time.LocalDateTime; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.helper.HmeFrameAssertHelper; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictPlatformMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictPlatform; - -@Service -public class DictPlatformService { - - @Autowired - private IDictPlatformMapper mPlatform; - - /*********************** - * 增加或者修改 - */ - public void editPlatform(DictPlatform platform) { - HmeFrameAssertHelper.isNotEmpty(platform.getPlatform_name(), "平台类型名称不允许为空！"); - // 判断类型是否存在 - List list = this.mPlatform.listByColumn("platform_name", platform.getPlatform_name()); - if (platform.getTsy_id() != null) { - if (list.size() > 0 && list.get(0).getTsy_id() - platform.getTsy_id() != 0) - throw new BusinessException("平台类型名称【" + platform.getPlatform_name() + "】已经存在，请检查！"); - // platform.setCreate_time(LocalDateTime.now()); - this.mPlatform.update(platform); - } else { - HmeFrameAssertHelper.isEmpty(list, "平台类型名称【" + platform.getPlatform_name() + "】已经存在，请检查！"); - platform.setCreate_time(LocalDateTime.now()); - this.mPlatform.insert(platform); - } - } - - /***************************** - * 删除， - */ - public void deletePlatform(int platform_id) { - /************** - * @todo 需要去判断是否真的可以删除 - */ - this.mPlatform.delete(platform_id); - } -} +package cn.tsy.cas.idsse.dsds.service.dict; + +import java.time.LocalDateTime; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.helper.HmeFrameAssertHelper; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictPlatformMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictPlatform; + +@Service +public class DictPlatformService { + + @Autowired + private IDictPlatformMapper mPlatform; + + /*********************** + * 增加或者修改 + */ + public void editPlatform(DictPlatform platform) { + HmeFrameAssertHelper.isNotEmpty(platform.getPlatform_name(), "平台类型名称不允许为空！"); + // 判断类型是否存在 + List list = this.mPlatform.listByColumn("platform_name", platform.getPlatform_name()); + if (platform.getTsy_id() != null) { + if (list.size() > 0 && list.get(0).getTsy_id() - platform.getTsy_id() != 0) + throw new BusinessException("平台类型名称【" + platform.getPlatform_name() + "】已经存在，请检查！"); + // platform.setCreate_time(LocalDateTime.now()); + this.mPlatform.update(platform); + } else { + HmeFrameAssertHelper.isEmpty(list, "平台类型名称【" + platform.getPlatform_name() + "】已经存在，请检查！"); + platform.setCreate_time(LocalDateTime.now()); + this.mPlatform.insert(platform); + } + } + + /***************************** + * 删除， + */ + public void deletePlatform(int platform_id) { + /************** + * @todo 需要去判断是否真的可以删除 + */ + this.mPlatform.delete(platform_id); + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictUnitSailService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictUnitSailService.java index 3e6b14a..38265e2 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictUnitSailService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictUnitSailService.java @@ -1,47 +1,47 @@ -package cn.tsy.cas.idsse.dsds.service.dict; - -import java.time.LocalDateTime; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.helper.HmeFrameAssertHelper; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictUnitSailMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictUnitSail; - -@Service -public class DictUnitSailService { - - @Autowired - private IDictUnitSailMapper mUnitSail; - - /*********************** - * 增加或者修改 - */ - public void editUnitSail(DictUnitSail sail) { - HmeFrameAssertHelper.isNotEmpty(sail.getUnit_name(), "参航单位名称不允许为空！"); - // 判断类型是否存在 - List list = this.mUnitSail.listByColumn("unit_name", sail.getUnit_name()); - if (sail.getTsy_id() != null) { - if (list.size() > 0 && list.get(0).getTsy_id() - sail.getTsy_id() != 0) - throw new BusinessException("参航单位名称【" + sail.getUnit_name() + "】已经存在，请检查！"); - this.mUnitSail.update(sail); - } else { - HmeFrameAssertHelper.isEmpty(list, "参航单位名称【" + sail.getUnit_name() + "】已经存在，请检查！"); - sail.setCreate_time(LocalDateTime.now()); - this.mUnitSail.insert(sail); - } - } - - /***************************** - * 删除， - */ - public void deleteUnitSail(int sail_id) { - /************** - * @todo 需要去判断是否真的可以删除 - */ - this.mUnitSail.delete(sail_id); - } -} +package cn.tsy.cas.idsse.dsds.service.dict; + +import java.time.LocalDateTime; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.helper.HmeFrameAssertHelper; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictUnitSailMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictUnitSail; + +@Service +public class DictUnitSailService { + + @Autowired + private IDictUnitSailMapper mUnitSail; + + /*********************** + * 增加或者修改 + */ + public void editUnitSail(DictUnitSail sail) { + HmeFrameAssertHelper.isNotEmpty(sail.getUnit_name(), "参航单位名称不允许为空！"); + // 判断类型是否存在 + List list = this.mUnitSail.listByColumn("unit_name", sail.getUnit_name()); + if (sail.getTsy_id() != null) { + if (list.size() > 0 && list.get(0).getTsy_id() - sail.getTsy_id() != 0) + throw new BusinessException("参航单位名称【" + sail.getUnit_name() + "】已经存在，请检查！"); + this.mUnitSail.update(sail); + } else { + HmeFrameAssertHelper.isEmpty(list, "参航单位名称【" + sail.getUnit_name() + "】已经存在，请检查！"); + sail.setCreate_time(LocalDateTime.now()); + this.mUnitSail.insert(sail); + } + } + + /***************************** + * 删除， + */ + public void deleteUnitSail(int sail_id) { + /************** + * @todo 需要去判断是否真的可以删除 + */ + this.mUnitSail.delete(sail_id); + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictUnitShareService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictUnitShareService.java index 28f5cc5..0362fd5 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictUnitShareService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/dict/DictUnitShareService.java @@ -1,47 +1,47 @@ -package cn.tsy.cas.idsse.dsds.service.dict; - -import java.time.LocalDateTime; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.helper.HmeFrameAssertHelper; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictUnitShareMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictUnitShare; - -@Service -public class DictUnitShareService { - - @Autowired - private IDictUnitShareMapper mUnitShare; - - /*********************** - * 增加或者修改 - */ - public void editUnitShare(DictUnitShare share) { - HmeFrameAssertHelper.isNotEmpty(share.getUnit_name(), "共享单位名称不允许为空！"); - // 判断类型是否存在 - List list = this.mUnitShare.listByColumn("unit_name", share.getUnit_name()); - if (share.getTsy_id() != null) { - if (list.size() > 0 && list.get(0).getTsy_id() - share.getTsy_id() != 0) - throw new BusinessException("共享单位名称【" + share.getUnit_name() + "】已经存在，请检查！"); - this.mUnitShare.update(share); - } else { - HmeFrameAssertHelper.isEmpty(list, "共享单位名称【" + share.getUnit_name() + "】已经存在，请检查！"); - share.setCreate_time(LocalDateTime.now()); - this.mUnitShare.insert(share); - } - } - - /***************************** - * 删除， - */ - public void deleteUnitShare(int share_id) { - /************** - * @todo 需要去判断是否真的可以删除 - */ - this.mUnitShare.delete(share_id); - } -} +package cn.tsy.cas.idsse.dsds.service.dict; + +import java.time.LocalDateTime; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.helper.HmeFrameAssertHelper; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictUnitShareMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictUnitShare; + +@Service +public class DictUnitShareService { + + @Autowired + private IDictUnitShareMapper mUnitShare; + + /*********************** + * 增加或者修改 + */ + public void editUnitShare(DictUnitShare share) { + HmeFrameAssertHelper.isNotEmpty(share.getUnit_name(), "共享单位名称不允许为空！"); + // 判断类型是否存在 + List list = this.mUnitShare.listByColumn("unit_name", share.getUnit_name()); + if (share.getTsy_id() != null) { + if (list.size() > 0 && list.get(0).getTsy_id() - share.getTsy_id() != 0) + throw new BusinessException("共享单位名称【" + share.getUnit_name() + "】已经存在，请检查！"); + this.mUnitShare.update(share); + } else { + HmeFrameAssertHelper.isEmpty(list, "共享单位名称【" + share.getUnit_name() + "】已经存在，请检查！"); + share.setCreate_time(LocalDateTime.now()); + this.mUnitShare.insert(share); + } + } + + /***************************** + * 删除， + */ + public void deleteUnitShare(int share_id) { + /************** + * @todo 需要去判断是否真的可以删除 + */ + this.mUnitShare.delete(share_id); + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleDatasetService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleDatasetService.java index c2f1af8..73782e0 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleDatasetService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleDatasetService.java @@ -1,406 +1,406 @@ -package cn.tsy.cas.idsse.dsds.service.sample; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.data.frame.model.HmeFrameOptr; -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.helper.HmeFrameAssertHelper; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.helper.time.HmeLocalDateHelper; -import cn.hme.framework.helper.time.HmeTimeHelper.TimeCompareType; -import cn.hme.framework.jdbc.entity.OrderBy; -import cn.hme.framework.jdbc.entity.SqlCondition; -import cn.hme.framework.jdbc.entity.SqlQuery; -import cn.tsy.cas.idsse.dsds.constant.VoyageJobType; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictDataMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictEquipmentMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictPlatformMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetTrackMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleLineMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleStationMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageMemberMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictData; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictEquipment; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictPlatform; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDatasetTrack; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleLine; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleStation; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageMember; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; - -@Service -public class SampleDatasetService { - @Autowired - private IVoyageRegMapper mVoyage; - @Autowired - private ISampleDatasetMapper mDataset; - @Autowired - private ISampleLineMapper mLine; - @Autowired - private ISampleStationMapper mStation; - @Autowired - private ISampleDatasetTrackMapper mMapper; - @Autowired - private IDictPlatformMapper mPlatform; - @Autowired - private IDictEquipmentMapper mEquipment; - @Autowired - private IDictDataMapper mData; - @Autowired - private IVoyageMemberMapper mMember; - - /*********************** - * 增加或者修改 - * - */ - public SampleDataset editDataset(SampleDataset dataset, Integer old_dataset_id, HmeFrameOptr optr) { - HmeFrameAssertHelper.isNotNull(dataset.getVoyage_id(), "航次号不能为空！"); - HmeFrameAssertHelper.isNotNull(dataset.getPlatform_id(), "平台类型不能为空！"); - // HmeFrameAssertHelper.isNotEmpty(dataset.getPlatform_name(), "平台名称不能为空！"); - HmeFrameAssertHelper.isNotNull(dataset.getEquipment_id(), "设备类型不能为空！"); - HmeFrameAssertHelper.isNotNull(dataset.getData_id(), "数据样品类型不能为空！"); - HmeFrameAssertHelper.isNotEmpty(dataset.getJob_type(), "作业类型不能为空！"); - // TS2-37-1_SY665_JXS_WW_ - // 数据样品编号： 航次号_潜次号_设备类型_数据样品类型_作业序号 - // - VoyageReg voyage = this.mVoyage.find(dataset.getVoyage_id()); - HmeFrameAssertHelper.isNotNull(voyage, "未找到指定的航次信息，请检查！"); - - if (dataset.getWater_in_time() != null && dataset.getWater_out_time() != null) { - dataset.setWater_minutes(HmeLocalDateHelper.calTimeDiff(dataset.getWater_out_time(), dataset.getWater_in_time(), TimeCompareType.Minute).intValue()); - } - if (dataset.getBottom_time() != null && dataset.getReceive_time() != null) { - dataset.setJob_minutes(HmeLocalDateHelper.calTimeDiff(dataset.getReceive_time(), dataset.getBottom_time(), TimeCompareType.Minute).intValue()); - } - if (dataset.getTsy_id() == null) { - DictPlatform platform = this.mPlatform.find(dataset.getPlatform_id()); - DictEquipment equipment = this.mEquipment.find(dataset.getEquipment_id()); - DictData data = this.mData.find(dataset.getData_id()); - dataset.setCreate_time(LocalDateTime.now()); - dataset.setPlatform_type(platform.getPlatform_name()); - dataset.setPlatform_alias(platform.getPlatform_alias()); - dataset.setEquipment_type(equipment.getEquipment_name()); - dataset.setEquipment_alias(equipment.getEquipment_alias()); - dataset.setData_alias(data.getData_alias()); - dataset.setData_type(data.getData_name()); - dataset.setVoyage_name(voyage.getVoyage_name()); - // 新增，需要生成数据集和数据样品编号 - String dataset_name = voyage.getVoyage_name() + "_" + (HmeStringHelper.isEmpty(dataset.getDiving_sn()) ? dataset.getPlatform_alias() : dataset.getDiving_sn()) + "_" + dataset.getEquipment_alias() + "_" + dataset.getData_alias(); - // 找到序号 - SampleDataset ds = this.mDataset.findByColumn("dataset_name", dataset_name); - if (ds != null) { - return ds; - // throw new BusinessException("数据集["++"]已经存在，无需重复添加！"); - } - - dataset.setDataset_name(dataset_name); - this.mDataset.insert(dataset); - - if (old_dataset_id != null && HmeStringHelper.hasValue(dataset.getDiving_sn())) { - // 如果是从旧数据集复制的 - SampleDataset old = this.mDataset.find(old_dataset_id); - if (HmeStringHelper.hasValue(old.getDiving_track_file())) { - // 如果有潜轨迹文件 - SampleDataset dd = new SampleDataset(); - dd.setTsy_id(dataset.getTsy_id()); - dd.setDiving_track_file(old.getDiving_track_file()); - this.mDataset.update(dd); - // 轨迹 - for (SampleDatasetTrack t : this.mMapper.listByColumnWithOrder("dataset_id", old_dataset_id, OrderBy.of("tsy_id"))) { - t.setDataset_id(dataset.getTsy_id()); - t.setTsy_id(null); - this.mMapper.insert(t); - } - } - - } - - } else { - this.mDataset.update(dataset); - - } - return dataset; - - } - - public List uploadSample(List> values, HmeFrameOptr optr) { - /**** - * *航次名称 *平台类型 *平台名称 *潜次序号 布放经度 布放纬度 布放深度 - * 入水时间 出水时间 左舷 右舷 主驾 - * 坐底时间 抛载时间 回收时间 - * *设备类型 设备序列号 - * *作业类型 *样品类型 序号 采样时间 经度 纬度 深度 测线号 深度 开始经度 开始纬度 结束经度 结束纬度 开始时间 结束时间 备注 数据公开期限 - */ - - HmeFrameAssertHelper.hasValue(values, "导入的文件中无有效数据，请检查！"); - for (int i = 1; i < values.size(); i++) { - List list = values.get(i); - if (list.get(0) == null || list.get(0).trim().length() == 0) - break; - // *航次名称 *平台类型 *平台名称 *潜次序号 布放经度 布放纬度 布放深度 - // 入水时间 出水时间 左舷 右舷 主驾 坐底时间 抛载时间 回收时间 - // *设备类型 设备序列号 *作业类型 *样品类型 文物器号 - String voyage_name = list.get(0); - String platform_type = list.get(1); - String platform_name = list.get(2); - String diving_name = list.get(3); - String wiring_lon = list.get(4); - String wiring_lat = list.get(5); - String wiring_deep = list.get(6); - String water_in_time = list.get(7); - String water_out_time = list.get(8); - String driver_left = list.get(9); - String driver_right = list.get(10); - String driver_master = list.get(11); - String bottom_time = list.get(12); - String throwing_time = list.get(13); - String receive_time = list.get(14); - String equipment_type = list.get(15); - String equipment_sn = list.get(16); - String job_type = list.get(17); - String data_name = list.get(18); - - String station_seq = list.get(19); - // 采样时间 经度 纬度 深度 - String sampling_time = list.get(20); - String sampling_lon = list.get(21); - String sampling_lat = list.get(22); - String sampling_deep = list.get(23); - // 测线号 深度 开始经度 开始纬度 结束经度 结束纬度 开始时间 结束时间 备注 数据公开期限 - String line_sn = list.get(24); - String line_deep = list.get(25); - String start_lon = list.get(26); - String start_lat = list.get(27); - String end_lon = list.get(28); - String end_lat = list.get(29); - String start_time = list.get(30); - String end_time = list.get(31); - String data_status = list.get(32); - String remark = list.get(33); - String data_role = list.get(34); - String fouing_org = list.get(35); - - SampleDataset sa = new SampleDataset(); - VoyageReg voyage = this.mVoyage.findByColumn("voyage_name", voyage_name); - if (voyage == null) - throwError(i, "航次[" + voyage_name + "]未找到，请先添加该航次"); - sa.setVoyage_id(voyage.getTsy_id()); - sa.setVoyage_name(voyage_name); - DictPlatform platform = this.mPlatform.findByColumn("platform_name", platform_type); - if (platform == null) - throwError(i, "平台类型[" + platform_type + "]未找到，请先添加该平台类型"); - sa.setPlatform_type(platform_type); - sa.setPlatform_name(platform_name); - sa.setPlatform_id(platform.getTsy_id()); - sa.setPlatform_alias(platform.getPlatform_alias()); - DictEquipment equipment = this.mEquipment.findByColumn("equipment_name", equipment_type); - if (equipment == null) - throwError(i, "设备类型[" + equipment_type + "]未找到，请先添加该设备类型"); - sa.setEquipment_alias(equipment.getEquipment_alias()); - sa.setEquipment_id(equipment.getTsy_id()); - sa.setEquipment_type(equipment_type); - DictData data = this.mData.findByColumn("data_name", data_name); - if (data == null) - throwError(i, "数据样品类型[" + data_name + "]未找到，请先添加该数据样品类型"); - sa.setData_alias(data.getData_alias()); - sa.setData_id(data.getTsy_id()); - sa.setData_type(data.getData_name()); - sa.setJob_type(job_type); - sa.setDiving_sn(diving_name); - sa.setEquipment_sn(equipment_sn); - - if (HmeStringHelper.hasValue(wiring_lon)) - sa.setWiring_lon(checkValue(wiring_lon)); - if (HmeStringHelper.hasValue(wiring_lat)) - sa.setWiring_lat(checkValue(wiring_lat)); - if (HmeStringHelper.hasValue(wiring_deep)) - sa.setWiring_deep(wiring_deep); - if (HmeStringHelper.hasValue(water_in_time)) - sa.setWater_in_time(HmeLocalDateHelper.parseDateTime(water_in_time)); - if (HmeStringHelper.hasValue(water_out_time)) - sa.setWater_out_time(HmeLocalDateHelper.parseDateTime(water_out_time)); - if (HmeStringHelper.hasValue(driver_left)) { - sa.setDriver_left(driver_left); - // 获取科学家单位 - List mArray = this.mMember.list(SqlQuery.create() - .addCondition("voyage_id", voyage.getTsy_id()) - .addCondition("member_name", driver_left)); - if(mArray.size()>0) - sa.setDriver_unit_left(mArray.get(0).getMember_unit()); - } - if (HmeStringHelper.hasValue(driver_right)) { - sa.setDriver_right(driver_right); - List mArray = this.mMember.list(SqlQuery.create() - .addCondition("voyage_id", voyage.getTsy_id()) - .addCondition("member_name", driver_right)); - if(mArray.size()>0) - sa.setDriver_unit_right(mArray.get(0).getMember_unit()); - } - if (HmeStringHelper.hasValue(driver_master)) - sa.setDriver_master(driver_master); - if (HmeStringHelper.hasValue(bottom_time)) - sa.setBottom_time(HmeLocalDateHelper.parseDateTime(bottom_time)); - if (HmeStringHelper.hasValue(throwing_time)) - sa.setThrowing_time(HmeLocalDateHelper.parseDateTime(throwing_time)); - if (HmeStringHelper.hasValue(receive_time)) - sa.setReceive_time(HmeLocalDateHelper.parseDateTime(receive_time)); - - // 新增，需要生成数据集和数据样品编号 - String dataset_name = voyage.getVoyage_name() + "_" + (HmeStringHelper.isEmpty(diving_name) ? platform.getPlatform_alias() : diving_name) + "_" + equipment.getEquipment_alias() + "_" + data.getData_alias(); - sa.setDataset_name(dataset_name); - if (sa.getWater_in_time() != null && sa.getWater_out_time() != null) { - sa.setWater_minutes(HmeLocalDateHelper.calTimeDiff(sa.getWater_out_time(), sa.getWater_in_time(), TimeCompareType.Minute).intValue()); - } - if (sa.getBottom_time() != null && sa.getThrowing_time() != null) { - sa.setJob_minutes(HmeLocalDateHelper.calTimeDiff(sa.getThrowing_time(), sa.getBottom_time(), TimeCompareType.Minute).intValue()); - } - SampleDataset ds = this.mDataset.findByColumn("dataset_name", dataset_name); - if (ds == null) { - sa.setCreate_time(LocalDateTime.now()); - this.mDataset.insert(sa); - } else { - sa.setTsy_id(ds.getTsy_id()); - this.mDataset.update(sa); - } - - SampleLine line = new SampleLine(); - SampleStation st = new SampleStation(); - if (HmeStringHelper.isEmpty(job_type)) - throwError(i, "作业类型为空，请检查！"); - if (VoyageJobType.Line.equals(job_type)) { - if(HmeStringHelper.hasValue(fouing_org)) - line.setFunding_org(fouing_org); - if (HmeStringHelper.hasValue(line_sn)) - line.setLine_sn(line_sn); - if (HmeStringHelper.hasValue(start_lon)) - line.setStart_lon(checkValue(start_lon)); - if (HmeStringHelper.hasValue(start_lat)) - line.setStart_lat(checkValue(start_lat)); - if (HmeStringHelper.hasValue(end_lon)) - line.setEnd_lon(checkValue(end_lon)); - if (HmeStringHelper.hasValue(end_lat)) - line.setEnd_lat(checkValue(end_lat)); - if (HmeStringHelper.hasValue(start_time)) - line.setStart_time(HmeLocalDateHelper.parseDateTime(start_time)); - if (HmeStringHelper.hasValue(end_time)) - line.setEnd_time(HmeLocalDateHelper.parseDateTime(end_time)); - if(HmeStringHelper.hasValue(data_status)) - line.setSample_status(data_status); - line.setDataset_name(dataset_name); - line.setDataset_id(sa.getTsy_id()); - if (HmeStringHelper.isEmpty(line_sn)) { - // 找到序号 - Integer total = this.mLine.count(SqlCondition.of("dataset_name", dataset_name)); - String sample_code = ""; - int seq = 1; - if (total == null || total - 0 == 0) - sample_code = dataset_name + "_01"; - else { - seq = total + 1; - sample_code = dataset_name + HmeStringHelper.leftPad(seq + "", 2, '0'); - } - line.setSample_seq(HmeStringHelper.leftPad(seq + "", 2, '0')); - line.setSample_name(sample_code); - } else { - line.setLine_sn(HmeStringHelper.leftPad(line_sn + "", 2, '0')); - line.setSample_seq(HmeStringHelper.leftPad(line_sn + "", 2, '0')); - line.setSample_name(dataset_name + "_" + HmeStringHelper.leftPad(line_sn + "", 2, '0')); - } - if (HmeStringHelper.hasValue(line_deep)) - line.setLine_deep(line_deep); - if (HmeStringHelper.hasValue(remark)) - line.setSample_remark(remark); - if (HmeStringHelper.hasValue(data_role)) - line.setPublish_rule(data_role); - - line.setCreate_time(LocalDateTime.now()); - // 判断是否存在 - if (this.mLine.findByColumn("sample_name", line.getSample_name()) != null) { +package cn.tsy.cas.idsse.dsds.service.sample; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.data.frame.model.HmeFrameOptr; +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.helper.HmeFrameAssertHelper; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.helper.time.HmeLocalDateHelper; +import cn.hme.framework.helper.time.HmeTimeHelper.TimeCompareType; +import cn.hme.framework.jdbc.entity.OrderBy; +import cn.hme.framework.jdbc.entity.SqlCondition; +import cn.hme.framework.jdbc.entity.SqlQuery; +import cn.tsy.cas.idsse.dsds.constant.VoyageJobType; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictDataMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictEquipmentMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictPlatformMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetTrackMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleLineMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleStationMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageMemberMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictData; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictEquipment; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictPlatform; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDatasetTrack; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleLine; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleStation; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageMember; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; + +@Service +public class SampleDatasetService { + @Autowired + private IVoyageRegMapper mVoyage; + @Autowired + private ISampleDatasetMapper mDataset; + @Autowired + private ISampleLineMapper mLine; + @Autowired + private ISampleStationMapper mStation; + @Autowired + private ISampleDatasetTrackMapper mMapper; + @Autowired + private IDictPlatformMapper mPlatform; + @Autowired + private IDictEquipmentMapper mEquipment; + @Autowired + private IDictDataMapper mData; + @Autowired + private IVoyageMemberMapper mMember; + + /*********************** + * 增加或者修改 + * + */ + public SampleDataset editDataset(SampleDataset dataset, Integer old_dataset_id, HmeFrameOptr optr) { + HmeFrameAssertHelper.isNotNull(dataset.getVoyage_id(), "航次号不能为空！"); + HmeFrameAssertHelper.isNotNull(dataset.getPlatform_id(), "平台类型不能为空！"); + // HmeFrameAssertHelper.isNotEmpty(dataset.getPlatform_name(), "平台名称不能为空！"); + HmeFrameAssertHelper.isNotNull(dataset.getEquipment_id(), "设备类型不能为空！"); + HmeFrameAssertHelper.isNotNull(dataset.getData_id(), "数据样品类型不能为空！"); + HmeFrameAssertHelper.isNotEmpty(dataset.getJob_type(), "作业类型不能为空！"); + // TS2-37-1_SY665_JXS_WW_ + // 数据样品编号： 航次号_潜次号_设备类型_数据样品类型_作业序号 + // + VoyageReg voyage = this.mVoyage.find(dataset.getVoyage_id()); + HmeFrameAssertHelper.isNotNull(voyage, "未找到指定的航次信息，请检查！"); + + if (dataset.getWater_in_time() != null && dataset.getWater_out_time() != null) { + dataset.setWater_minutes(HmeLocalDateHelper.calTimeDiff(dataset.getWater_out_time(), dataset.getWater_in_time(), TimeCompareType.Minute).intValue()); + } + if (dataset.getBottom_time() != null && dataset.getReceive_time() != null) { + dataset.setJob_minutes(HmeLocalDateHelper.calTimeDiff(dataset.getReceive_time(), dataset.getBottom_time(), TimeCompareType.Minute).intValue()); + } + if (dataset.getTsy_id() == null) { + DictPlatform platform = this.mPlatform.find(dataset.getPlatform_id()); + DictEquipment equipment = this.mEquipment.find(dataset.getEquipment_id()); + DictData data = this.mData.find(dataset.getData_id()); + dataset.setCreate_time(LocalDateTime.now()); + dataset.setPlatform_type(platform.getPlatform_name()); + dataset.setPlatform_alias(platform.getPlatform_alias()); + dataset.setEquipment_type(equipment.getEquipment_name()); + dataset.setEquipment_alias(equipment.getEquipment_alias()); + dataset.setData_alias(data.getData_alias()); + dataset.setData_type(data.getData_name()); + dataset.setVoyage_name(voyage.getVoyage_name()); + // 新增，需要生成数据集和数据样品编号 + String dataset_name = voyage.getVoyage_name() + "_" + (HmeStringHelper.isEmpty(dataset.getDiving_sn()) ? dataset.getPlatform_alias() : dataset.getDiving_sn()) + "_" + dataset.getEquipment_alias() + "_" + dataset.getData_alias(); + // 找到序号 + SampleDataset ds = this.mDataset.findByColumn("dataset_name", dataset_name); + if (ds != null) { + return ds; + // throw new BusinessException("数据集["++"]已经存在，无需重复添加！"); + } + + dataset.setDataset_name(dataset_name); + this.mDataset.insert(dataset); + + if (old_dataset_id != null && HmeStringHelper.hasValue(dataset.getDiving_sn())) { + // 如果是从旧数据集复制的 + SampleDataset old = this.mDataset.find(old_dataset_id); + if (HmeStringHelper.hasValue(old.getDiving_track_file())) { + // 如果有潜轨迹文件 + SampleDataset dd = new SampleDataset(); + dd.setTsy_id(dataset.getTsy_id()); + dd.setDiving_track_file(old.getDiving_track_file()); + this.mDataset.update(dd); + // 轨迹 + for (SampleDatasetTrack t : this.mMapper.listByColumnWithOrder("dataset_id", old_dataset_id, OrderBy.of("tsy_id"))) { + t.setDataset_id(dataset.getTsy_id()); + t.setTsy_id(null); + this.mMapper.insert(t); + } + } + + } + + } else { + this.mDataset.update(dataset); + + } + return dataset; + + } + + public List uploadSample(List> values, HmeFrameOptr optr) { + /**** + * *航次名称 *平台类型 *平台名称 *潜次序号 布放经度 布放纬度 布放深度 + * 入水时间 出水时间 左舷 右舷 主驾 + * 坐底时间 抛载时间 回收时间 + * *设备类型 设备序列号 + * *作业类型 *样品类型 序号 采样时间 经度 纬度 深度 测线号 深度 开始经度 开始纬度 结束经度 结束纬度 开始时间 结束时间 备注 数据公开期限 + */ + + HmeFrameAssertHelper.hasValue(values, "导入的文件中无有效数据，请检查！"); + for (int i = 1; i < values.size(); i++) { + List list = values.get(i); + if (list.get(0) == null || list.get(0).trim().length() == 0) + break; + // *航次名称 *平台类型 *平台名称 *潜次序号 布放经度 布放纬度 布放深度 + // 入水时间 出水时间 左舷 右舷 主驾 坐底时间 抛载时间 回收时间 + // *设备类型 设备序列号 *作业类型 *样品类型 文物器号 + String voyage_name = list.get(0); + String platform_type = list.get(1); + String platform_name = list.get(2); + String diving_name = list.get(3); + String wiring_lon = list.get(4); + String wiring_lat = list.get(5); + String wiring_deep = list.get(6); + String water_in_time = list.get(7); + String water_out_time = list.get(8); + String driver_left = list.get(9); + String driver_right = list.get(10); + String driver_master = list.get(11); + String bottom_time = list.get(12); + String throwing_time = list.get(13); + String receive_time = list.get(14); + String equipment_type = list.get(15); + String equipment_sn = list.get(16); + String job_type = list.get(17); + String data_name = list.get(18); + + String station_seq = list.get(19); + // 采样时间 经度 纬度 深度 + String sampling_time = list.get(20); + String sampling_lon = list.get(21); + String sampling_lat = list.get(22); + String sampling_deep = list.get(23); + // 测线号 深度 开始经度 开始纬度 结束经度 结束纬度 开始时间 结束时间 备注 数据公开期限 + String line_sn = list.get(24); + String line_deep = list.get(25); + String start_lon = list.get(26); + String start_lat = list.get(27); + String end_lon = list.get(28); + String end_lat = list.get(29); + String start_time = list.get(30); + String end_time = list.get(31); + String data_status = list.get(32); + String remark = list.get(33); + String data_role = list.get(34); + String fouing_org = list.get(35); + + SampleDataset sa = new SampleDataset(); + VoyageReg voyage = this.mVoyage.findByColumn("voyage_name", voyage_name); + if (voyage == null) + throwError(i, "航次[" + voyage_name + "]未找到，请先添加该航次"); + sa.setVoyage_id(voyage.getTsy_id()); + sa.setVoyage_name(voyage_name); + DictPlatform platform = this.mPlatform.findByColumn("platform_name", platform_type); + if (platform == null) + throwError(i, "平台类型[" + platform_type + "]未找到，请先添加该平台类型"); + sa.setPlatform_type(platform_type); + sa.setPlatform_name(platform_name); + sa.setPlatform_id(platform.getTsy_id()); + sa.setPlatform_alias(platform.getPlatform_alias()); + DictEquipment equipment = this.mEquipment.findByColumn("equipment_name", equipment_type); + if (equipment == null) + throwError(i, "设备类型[" + equipment_type + "]未找到，请先添加该设备类型"); + sa.setEquipment_alias(equipment.getEquipment_alias()); + sa.setEquipment_id(equipment.getTsy_id()); + sa.setEquipment_type(equipment_type); + DictData data = this.mData.findByColumn("data_name", data_name); + if (data == null) + throwError(i, "数据样品类型[" + data_name + "]未找到，请先添加该数据样品类型"); + sa.setData_alias(data.getData_alias()); + sa.setData_id(data.getTsy_id()); + sa.setData_type(data.getData_name()); + sa.setJob_type(job_type); + sa.setDiving_sn(diving_name); + sa.setEquipment_sn(equipment_sn); + + if (HmeStringHelper.hasValue(wiring_lon)) + sa.setWiring_lon(checkValue(wiring_lon)); + if (HmeStringHelper.hasValue(wiring_lat)) + sa.setWiring_lat(checkValue(wiring_lat)); + if (HmeStringHelper.hasValue(wiring_deep)) + sa.setWiring_deep(wiring_deep); + if (HmeStringHelper.hasValue(water_in_time)) + sa.setWater_in_time(HmeLocalDateHelper.parseDateTime(water_in_time)); + if (HmeStringHelper.hasValue(water_out_time)) + sa.setWater_out_time(HmeLocalDateHelper.parseDateTime(water_out_time)); + if (HmeStringHelper.hasValue(driver_left)) { + sa.setDriver_left(driver_left); + // 获取科学家单位 + List mArray = this.mMember.list(SqlQuery.create() + .addCondition("voyage_id", voyage.getTsy_id()) + .addCondition("member_name", driver_left)); + if(mArray.size()>0) + sa.setDriver_unit_left(mArray.get(0).getMember_unit()); + } + if (HmeStringHelper.hasValue(driver_right)) { + sa.setDriver_right(driver_right); + List mArray = this.mMember.list(SqlQuery.create() + .addCondition("voyage_id", voyage.getTsy_id()) + .addCondition("member_name", driver_right)); + if(mArray.size()>0) + sa.setDriver_unit_right(mArray.get(0).getMember_unit()); + } + if (HmeStringHelper.hasValue(driver_master)) + sa.setDriver_master(driver_master); + if (HmeStringHelper.hasValue(bottom_time)) + sa.setBottom_time(HmeLocalDateHelper.parseDateTime(bottom_time)); + if (HmeStringHelper.hasValue(throwing_time)) + sa.setThrowing_time(HmeLocalDateHelper.parseDateTime(throwing_time)); + if (HmeStringHelper.hasValue(receive_time)) + sa.setReceive_time(HmeLocalDateHelper.parseDateTime(receive_time)); + + // 新增，需要生成数据集和数据样品编号 + String dataset_name = voyage.getVoyage_name() + "_" + (HmeStringHelper.isEmpty(diving_name) ? platform.getPlatform_alias() : diving_name) + "_" + equipment.getEquipment_alias() + "_" + data.getData_alias(); + sa.setDataset_name(dataset_name); + if (sa.getWater_in_time() != null && sa.getWater_out_time() != null) { + sa.setWater_minutes(HmeLocalDateHelper.calTimeDiff(sa.getWater_out_time(), sa.getWater_in_time(), TimeCompareType.Minute).intValue()); + } + if (sa.getBottom_time() != null && sa.getThrowing_time() != null) { + sa.setJob_minutes(HmeLocalDateHelper.calTimeDiff(sa.getThrowing_time(), sa.getBottom_time(), TimeCompareType.Minute).intValue()); + } + SampleDataset ds = this.mDataset.findByColumn("dataset_name", dataset_name); + if (ds == null) { + sa.setCreate_time(LocalDateTime.now()); + this.mDataset.insert(sa); + } else { + sa.setTsy_id(ds.getTsy_id()); + this.mDataset.update(sa); + } + + SampleLine line = new SampleLine(); + SampleStation st = new SampleStation(); + if (HmeStringHelper.isEmpty(job_type)) + throwError(i, "作业类型为空，请检查！"); + if (VoyageJobType.Line.equals(job_type)) { + if(HmeStringHelper.hasValue(fouing_org)) + line.setFunding_org(fouing_org); + if (HmeStringHelper.hasValue(line_sn)) + line.setLine_sn(line_sn); + if (HmeStringHelper.hasValue(start_lon)) + line.setStart_lon(checkValue(start_lon)); + if (HmeStringHelper.hasValue(start_lat)) + line.setStart_lat(checkValue(start_lat)); + if (HmeStringHelper.hasValue(end_lon)) + line.setEnd_lon(checkValue(end_lon)); + if (HmeStringHelper.hasValue(end_lat)) + line.setEnd_lat(checkValue(end_lat)); + if (HmeStringHelper.hasValue(start_time)) + line.setStart_time(HmeLocalDateHelper.parseDateTime(start_time)); + if (HmeStringHelper.hasValue(end_time)) + line.setEnd_time(HmeLocalDateHelper.parseDateTime(end_time)); + if(HmeStringHelper.hasValue(data_status)) + line.setSample_status(data_status); + line.setDataset_name(dataset_name); + line.setDataset_id(sa.getTsy_id()); + if (HmeStringHelper.isEmpty(line_sn)) { + // 找到序号 + Integer total = this.mLine.count(SqlCondition.of("dataset_name", dataset_name)); + String sample_code = ""; + int seq = 1; + if (total == null || total - 0 == 0) + sample_code = dataset_name + "_01"; + else { + seq = total + 1; + sample_code = dataset_name + HmeStringHelper.leftPad(seq + "", 2, '0'); + } + line.setSample_seq(HmeStringHelper.leftPad(seq + "", 2, '0')); + line.setSample_name(sample_code); + } else { + line.setLine_sn(HmeStringHelper.leftPad(line_sn + "", 2, '0')); + line.setSample_seq(HmeStringHelper.leftPad(line_sn + "", 2, '0')); + line.setSample_name(dataset_name + "_" + HmeStringHelper.leftPad(line_sn + "", 2, '0')); + } + if (HmeStringHelper.hasValue(line_deep)) + line.setLine_deep(line_deep); + if (HmeStringHelper.hasValue(remark)) + line.setSample_remark(remark); + if (HmeStringHelper.hasValue(data_role)) + line.setPublish_rule(data_role); + + line.setCreate_time(LocalDateTime.now()); + // 判断是否存在 + if (this.mLine.findByColumn("sample_name", line.getSample_name()) != null) { this.mLine.deleteByColumn("sample_name", line.getSample_name()); - // throwError(i, "测线作业[" + st.getSample_name() + "]已经存在！"); - } - this.mLine.insert(line); - } else if (VoyageJobType.Station.equals(job_type)) { - if(HmeStringHelper.hasValue(fouing_org)) - st.setFunding_org(fouing_org); - if (HmeStringHelper.hasValue(sampling_time)) - st.setSampling_time(HmeLocalDateHelper.parseDateTime(sampling_time)); - if (HmeStringHelper.hasValue(sampling_lat)) - st.setSampling_lat(checkValue(sampling_lat)); - if (HmeStringHelper.hasValue(sampling_lon)) - st.setSampling_lon(checkValue(sampling_lon)); - if (HmeStringHelper.hasValue(sampling_deep)) - st.setSampling_deep(sampling_deep); - if (HmeStringHelper.isEmpty(station_seq)) { - // 找到序号 - Integer total = this.mStation.count(SqlCondition.of("dataset_name", dataset_name)); - String sample_code = ""; - int seq = 1; - if (total == null || total - 0 == 0) - sample_code = dataset_name + "_01"; - else { - seq = total + 1; - sample_code = dataset_name + HmeStringHelper.leftPad(seq + "", 2, '0'); - } - st.setSample_seq(HmeStringHelper.leftPad(seq + "", 2, '0')); - st.setSample_name(sample_code); - } else { - st.setSample_seq(HmeStringHelper.leftPad(station_seq + "", 2, '0')); - st.setSample_name(dataset_name + "_" + HmeStringHelper.leftPad(station_seq + "", 2, '0')); - } - - if (HmeStringHelper.hasValue(remark)) - st.setSample_remark(remark); - if (HmeStringHelper.hasValue(data_role)) - st.setPublish_rule(data_role); - // 判断是否存在 - if (this.mStation.findByColumn("sample_name", st.getSample_name()) != null) { - // throwError(i, "站位作业[" + st.getSample_name() + "]已经存在！"); - this.mStation.deleteByColumn("sample_name", st.getSample_name()); - } - st.setCreate_time(LocalDateTime.now()); - st.setDataset_name(dataset_name); - st.setDataset_id(sa.getTsy_id()); - this.mStation.insert(st); - - } else - throwError(i, "作业类型[" + job_type + "]必须为测线作业或者站位作业！"); - - } - return new ArrayList<>(); - } - - /**************** - * 删除数据样品 - * - */ - public void deleteDataset(int dataset_id) { - /**************** - * @todo 判断是否能实际删除 - */ - this.mDataset.delete(dataset_id); - } - - public void throwError(int row, String msg) { - throw new BusinessException("数据样品信息导入失败->第[" + (row + 1) + "]行:" + msg); - - } - - // 经纬度保留4位 - public String checkValue(String value) { - try { - return String.format("%.4f", Double.parseDouble(value)); - } catch (Exception e) { - return value; - } - } - -} + // throwError(i, "测线作业[" + st.getSample_name() + "]已经存在！"); + } + this.mLine.insert(line); + } else if (VoyageJobType.Station.equals(job_type)) { + if(HmeStringHelper.hasValue(fouing_org)) + st.setFunding_org(fouing_org); + if (HmeStringHelper.hasValue(sampling_time)) + st.setSampling_time(HmeLocalDateHelper.parseDateTime(sampling_time)); + if (HmeStringHelper.hasValue(sampling_lat)) + st.setSampling_lat(checkValue(sampling_lat)); + if (HmeStringHelper.hasValue(sampling_lon)) + st.setSampling_lon(checkValue(sampling_lon)); + if (HmeStringHelper.hasValue(sampling_deep)) + st.setSampling_deep(sampling_deep); + if (HmeStringHelper.isEmpty(station_seq)) { + // 找到序号 + Integer total = this.mStation.count(SqlCondition.of("dataset_name", dataset_name)); + String sample_code = ""; + int seq = 1; + if (total == null || total - 0 == 0) + sample_code = dataset_name + "_01"; + else { + seq = total + 1; + sample_code = dataset_name + HmeStringHelper.leftPad(seq + "", 2, '0'); + } + st.setSample_seq(HmeStringHelper.leftPad(seq + "", 2, '0')); + st.setSample_name(sample_code); + } else { + st.setSample_seq(HmeStringHelper.leftPad(station_seq + "", 2, '0')); + st.setSample_name(dataset_name + "_" + HmeStringHelper.leftPad(station_seq + "", 2, '0')); + } + + if (HmeStringHelper.hasValue(remark)) + st.setSample_remark(remark); + if (HmeStringHelper.hasValue(data_role)) + st.setPublish_rule(data_role); + // 判断是否存在 + if (this.mStation.findByColumn("sample_name", st.getSample_name()) != null) { + // throwError(i, "站位作业[" + st.getSample_name() + "]已经存在！"); + this.mStation.deleteByColumn("sample_name", st.getSample_name()); + } + st.setCreate_time(LocalDateTime.now()); + st.setDataset_name(dataset_name); + st.setDataset_id(sa.getTsy_id()); + this.mStation.insert(st); + + } else + throwError(i, "作业类型[" + job_type + "]必须为测线作业或者站位作业！"); + + } + return new ArrayList<>(); + } + + /**************** + * 删除数据样品 + * + */ + public void deleteDataset(int dataset_id) { + /**************** + * @todo 判断是否能实际删除 + */ + this.mDataset.delete(dataset_id); + } + + public void throwError(int row, String msg) { + throw new BusinessException("数据样品信息导入失败->第[" + (row + 1) + "]行:" + msg); + + } + + // 经纬度保留4位 + public String checkValue(String value) { + try { + return String.format("%.4f", Double.parseDouble(value)); + } catch (Exception e) { + return value; + } + } + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleDatasetTrackService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleDatasetTrackService.java index e63c4e3..56463f8 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleDatasetTrackService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleDatasetTrackService.java @@ -1,111 +1,111 @@ -package cn.tsy.cas.idsse.dsds.service.sample; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.data.frame.model.HmeFrameOptr; -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.helper.HmeFrameAssertHelper; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.helper.time.HmeLocalDateHelper; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictGeomMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetTrackMapper; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDatasetTrack; - -@Service -public class SampleDatasetTrackService { - @Autowired - private ISampleDatasetTrackMapper mTrack; - @Autowired - private ISampleDatasetMapper mDataset; - @Autowired - private IDictGeomMapper iGeom; - - public List uploadTrack(int dataset_id, List array, String file_name, HmeFrameOptr optr) { - HmeFrameAssertHelper.hasValue(array, "潜次轨迹文件为空，请检查！"); - List navArray = new ArrayList<>(); - String dv_sn = file_name.replace(".txt", ""); - List sdArray = this.mDataset.listByColumn("diving_sn", dv_sn); - if (sdArray.size() == 0) - throw new BusinessException("未找到潜次[" + dv_sn + "]对应的数据集！"); - -// SampleDataset dataset = this.mDataset.find(dataset_id); -// HmeFrameAssertHelper.isNotNull(dataset, "未找到指定数据集，请检查！"); -// this.mTrack.deleteByColumn("dataset_id", dataset_id); - for (int i = 0; i < array.size(); i++) { - if (array.get(i).trim().length() == 0) - break; - String[] values = HmeStringHelper.splitWithSpace(array.get(i)); - if (values.length < 3) { - throwError(i, "列不足，至少需要3列"); - } - - String lon = values[0]; - String lat = values[1]; - String time = values[2]; - // 经纬度的范围包括经度范围0°-180°和纬度范围0°-90° -// try { -// double d = Double.parseDouble(lon); -// if (d > 180) -// throwError(i, "经度[" + lon + "]不能大于 180°"); -// if (d < 0) -// throwError(i, "经度[" + lon + "]不能小于 0°"); -// } catch (Exception e) { -// throwError(i, "经度[" + lon + "]格式错误"); -// } - -// try { -// double d = Double.parseDouble(lat); -// if (d > 90) -// throwError(i, "纬度[" + lat + "]不能大于 90°"); -// if (d < 0) -// throwError(i, "纬度[" + lat + "]不能小于 0°"); -// } catch (Exception e) { -// throwError(i, "纬度[" + lat + "]格式错误"); -// } - // 109.49100 18.23400 2023-09-18-21:58:35 - String[] vs = time.split("-"); - if (vs.length != 4) - throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); - LocalDateTime curTime = HmeLocalDateHelper.parseDateTime(vs[0] + "-" + vs[1] + "-" + vs[2] + " " + vs[3].replace(".000", "")); - if (curTime == null) - throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); - // 判断通过 - SampleDatasetTrack nav = new SampleDatasetTrack(); - nav.setTrack_lat(lat); - nav.setTrack_lon(lon); - nav.setTrack_time(curTime); - navArray.add(nav); - - } - if (navArray.size() > 0) { - for(SampleDataset ds :sdArray) { - this.mTrack.deleteByColumn("dataset_id", ds.getTsy_id()); - for(SampleDatasetTrack nav :navArray) { - nav.setTsy_id(null); - nav.setDataset_id(ds.getTsy_id()); - this.mTrack.insert(nav); - } - SampleDataset d = new SampleDataset(); - d.setTsy_id(dataset_id); - d.setDiving_track_file(file_name); - this.mDataset.update(ds); - } - // 写入图层 - this.iGeom.createDiving(dv_sn); - } - return navArray; - } - - public void throwError(int row, String msg) { - throw new BusinessException("潜次轨迹文件导入失败->第[" + (row + 1) + "]行:" + msg); - - } - -} +package cn.tsy.cas.idsse.dsds.service.sample; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.data.frame.model.HmeFrameOptr; +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.helper.HmeFrameAssertHelper; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.helper.time.HmeLocalDateHelper; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictGeomMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetTrackMapper; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDatasetTrack; + +@Service +public class SampleDatasetTrackService { + @Autowired + private ISampleDatasetTrackMapper mTrack; + @Autowired + private ISampleDatasetMapper mDataset; + @Autowired + private IDictGeomMapper iGeom; + + public List uploadTrack(int dataset_id, List array, String file_name, HmeFrameOptr optr) { + HmeFrameAssertHelper.hasValue(array, "潜次轨迹文件为空，请检查！"); + List navArray = new ArrayList<>(); + String dv_sn = file_name.replace(".txt", ""); + List sdArray = this.mDataset.listByColumn("diving_sn", dv_sn); + if (sdArray.size() == 0) + throw new BusinessException("未找到潜次[" + dv_sn + "]对应的数据集！"); + +// SampleDataset dataset = this.mDataset.find(dataset_id); +// HmeFrameAssertHelper.isNotNull(dataset, "未找到指定数据集，请检查！"); +// this.mTrack.deleteByColumn("dataset_id", dataset_id); + for (int i = 0; i < array.size(); i++) { + if (array.get(i).trim().length() == 0) + break; + String[] values = HmeStringHelper.splitWithSpace(array.get(i)); + if (values.length < 3) { + throwError(i, "列不足，至少需要3列"); + } + + String lon = values[0]; + String lat = values[1]; + String time = values[2]; + // 经纬度的范围包括经度范围0°-180°和纬度范围0°-90° +// try { +// double d = Double.parseDouble(lon); +// if (d > 180) +// throwError(i, "经度[" + lon + "]不能大于 180°"); +// if (d < 0) +// throwError(i, "经度[" + lon + "]不能小于 0°"); +// } catch (Exception e) { +// throwError(i, "经度[" + lon + "]格式错误"); +// } + +// try { +// double d = Double.parseDouble(lat); +// if (d > 90) +// throwError(i, "纬度[" + lat + "]不能大于 90°"); +// if (d < 0) +// throwError(i, "纬度[" + lat + "]不能小于 0°"); +// } catch (Exception e) { +// throwError(i, "纬度[" + lat + "]格式错误"); +// } + // 109.49100 18.23400 2023-09-18-21:58:35 + String[] vs = time.split("-"); + if (vs.length != 4) + throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); + LocalDateTime curTime = HmeLocalDateHelper.parseDateTime(vs[0] + "-" + vs[1] + "-" + vs[2] + " " + vs[3].replace(".000", "")); + if (curTime == null) + throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); + // 判断通过 + SampleDatasetTrack nav = new SampleDatasetTrack(); + nav.setTrack_lat(lat); + nav.setTrack_lon(lon); + nav.setTrack_time(curTime); + navArray.add(nav); + + } + if (navArray.size() > 0) { + for(SampleDataset ds :sdArray) { + this.mTrack.deleteByColumn("dataset_id", ds.getTsy_id()); + for(SampleDatasetTrack nav :navArray) { + nav.setTsy_id(null); + nav.setDataset_id(ds.getTsy_id()); + this.mTrack.insert(nav); + } + SampleDataset d = new SampleDataset(); + d.setTsy_id(dataset_id); + d.setDiving_track_file(file_name); + this.mDataset.update(ds); + } + // 写入图层 + this.iGeom.createDiving(dv_sn); + } + return navArray; + } + + public void throwError(int row, String msg) { + throw new BusinessException("潜次轨迹文件导入失败->第[" + (row + 1) + "]行:" + msg); + + } + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.java index 4e2c955..4c006ff 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.java @@ -1,85 +1,85 @@ -package cn.tsy.cas.idsse.dsds.service.sample; - -import java.time.LocalDateTime; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.data.frame.model.HmeFrameOptr; -import cn.hme.framework.helper.lang.HmeGsonHelper; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.jdbc.entity.SqlCondition; -import cn.hme.industry.gnss.GnssCoordinateHelper; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleLineMapper; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleLine; - -@Service -public class SampleLineService { - @Autowired - private ISampleDatasetMapper mDataset; - @Autowired - private ISampleLineMapper mLine; - - /*********************** - * 增加或者修改 - * - */ - public SampleLine editLine(int dataset_id, SampleLine line, HmeFrameOptr optr) { - SampleDataset dataset = this.mDataset.find(dataset_id); - // - if (line.getTsy_id() == null) { - // 计算序号 - Integer total = this.mLine.count(SqlCondition.of("dataset_id", dataset_id)); - String seq = "01"; - if (total != null && total > 0) - seq = HmeStringHelper.leftPad((total + 1) + "", 2, '0'); - line.setDataset_id(dataset_id); - line.setDataset_name(dataset.getDataset_name()); - line.setSample_seq(seq); - line.setSample_name(dataset.getDataset_name() + "_" + seq); - line.setCreate_time(LocalDateTime.now()); - } - System.out.println(HmeGsonHelper.fromObject(line)); - // 计算覆盖面积 - if (line.getConver_width() == null) - line.setConver_area(0); - else { - if(HmeStringHelper.hasValue(line.getStart_lat()) && HmeStringHelper.hasValue(line.getEnd_lat()) - && HmeStringHelper.hasValue(line.getStart_lon()) && HmeStringHelper.hasValue(line.getEnd_lon())) { - try { - Double value = GnssCoordinateHelper.distanceHaversine( - Double.parseDouble(line.getStart_lat()) , - Double.parseDouble(line.getStart_lon()) , - Double.parseDouble(line.getEnd_lat()) , - Double.parseDouble(line.getEnd_lon()) ) * line.getConver_width(); - line.setConver_area(value.intValue()); - }catch(Exception e) { - e.printStackTrace(); - line.setConver_area(0); - } - } - } - - if (line.getTsy_id() == null) - this.mLine.insert(line); - else - this.mLine.update(line); - - return line; - - } - - /**************** - * 删除数据样品 - * - */ - public void deleteLine(int line_id) { - /**************** - * @todo 判断是否能实际删除 - */ - this.mLine.delete(line_id); - } - -} +package cn.tsy.cas.idsse.dsds.service.sample; + +import java.time.LocalDateTime; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.data.frame.model.HmeFrameOptr; +import cn.hme.framework.helper.lang.HmeGsonHelper; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.jdbc.entity.SqlCondition; +import cn.hme.industry.gnss.GnssCoordinateHelper; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleLineMapper; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleLine; + +@Service +public class SampleLineService { + @Autowired + private ISampleDatasetMapper mDataset; + @Autowired + private ISampleLineMapper mLine; + + /*********************** + * 增加或者修改 + * + */ + public SampleLine editLine(int dataset_id, SampleLine line, HmeFrameOptr optr) { + SampleDataset dataset = this.mDataset.find(dataset_id); + // + if (line.getTsy_id() == null) { + // 计算序号 + Integer total = this.mLine.count(SqlCondition.of("dataset_id", dataset_id)); + String seq = "01"; + if (total != null && total > 0) + seq = HmeStringHelper.leftPad((total + 1) + "", 2, '0'); + line.setDataset_id(dataset_id); + line.setDataset_name(dataset.getDataset_name()); + line.setSample_seq(seq); + line.setSample_name(dataset.getDataset_name() + "_" + seq); + line.setCreate_time(LocalDateTime.now()); + } + System.out.println(HmeGsonHelper.fromObject(line)); + // 计算覆盖面积 + if (line.getConver_width() == null) + line.setConver_area(0); + else { + if(HmeStringHelper.hasValue(line.getStart_lat()) && HmeStringHelper.hasValue(line.getEnd_lat()) + && HmeStringHelper.hasValue(line.getStart_lon()) && HmeStringHelper.hasValue(line.getEnd_lon())) { + try { + Double value = GnssCoordinateHelper.distanceHaversine( + Double.parseDouble(line.getStart_lat()) , + Double.parseDouble(line.getStart_lon()) , + Double.parseDouble(line.getEnd_lat()) , + Double.parseDouble(line.getEnd_lon()) ) * line.getConver_width(); + line.setConver_area(value.intValue()); + }catch(Exception e) { + e.printStackTrace(); + line.setConver_area(0); + } + } + } + + if (line.getTsy_id() == null) + this.mLine.insert(line); + else + this.mLine.update(line); + + return line; + + } + + /**************** + * 删除数据样品 + * + */ + public void deleteLine(int line_id) { + /**************** + * @todo 判断是否能实际删除 + */ + this.mLine.delete(line_id); + } + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineTrackService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineTrackService.java index e95d5ad..60858ce 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineTrackService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineTrackService.java @@ -1,220 +1,220 @@ -package cn.tsy.cas.idsse.dsds.service.sample; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.helper.HmeFrameAssertHelper; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.helper.log.HmeLogHelper; -import cn.hme.framework.helper.time.HmeLocalDateHelper; -import cn.hme.framework.jdbc.entity.SqlQuery; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleLineMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleLineTrackMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleLine; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleLineTrack; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; - -@Service -public class SampleLineTrackService { - @Autowired - private ISampleLineTrackMapper mTrack; - @Autowired - private ISampleLineMapper mLine; - @Autowired - private IVoyageRegMapper mVoyage; - @Autowired - private ISampleDatasetMapper mDataset; - - public List uploadTrack(int dataset_id, List array, String file_name) { - HmeFrameAssertHelper.hasValue(array, "测线轨迹文件为空，请检查！"); - if (file_name.toLowerCase().endsWith("m.txt")) { - SampleDataset ds = this.mDataset.find(dataset_id); - if (ds == null) { - throw new BusinessException("未找到对应的数据集信息！"); - } - VoyageReg voyage = this.mVoyage.find(ds.getVoyage_id()); - String heigth = file_name.replace(".txt", "").replaceAll("m", "").split("_")[1]; - // 判断是否已经输入了 - this.mLine.deleteByColumn("dataset_id", dataset_id); - int index = 1; - SampleLine line = new SampleLine(); - for (int i = 0; i < array.size(); i++) { - if (array.get(i).trim().length() == 0) { - break; - } - String[] values = HmeStringHelper.splitWithSpace(array.get(i)); - if (values[0].equals(">>")) { - this.createLine(voyage,ds, line, heigth, index); - line = new SampleLine(); - HmeLogHelper.info("dataset_index:"+index); - index++; - continue; - } - String lon = values[0]; - String lat = values[1]; - String time = values[2]; - // 经纬度的范围包括经度范围0°-180°和纬度范围0°-90° - try { - double d = Double.parseDouble(lon); - if (d > 180) - throwError(i, "经度[" + lon + "]不能大于 180°"); - if (d < 0) - throwError(i, "经度[" + lon + "]不能小于 0°"); - } catch (Exception e) { - throwError(i, "经度[" + lon + "]格式错误"); - } - - try { - double d = Double.parseDouble(lat); - if (d > 90) - throwError(i, "纬度[" + lat + "]不能大于 90°"); - if (d < 0) - throwError(i, "纬度[" + lat + "]不能小于 0°"); - } catch (Exception e) { - throwError(i, "纬度[" + lat + "]格式错误"); - } - // 109.49100 18.23400 2023-09-18-21:58:35 - String[] vs = time.split("-"); - if (vs.length != 4) - throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); - LocalDateTime curTime = HmeLocalDateHelper.parseDateTime(vs[0] + "-" + vs[1] + "-" + vs[2] + " " + vs[3]); - if (curTime == null) - throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); - // 判断通过 - if (values.length < 3) { - throwError(i, "列不足，至少需要3列"); - } - if (line.getStart_lat() == null) - line.setStart_lat(lat); - if (line.getStart_lon() == null) - line.setStart_lon(lon); - if (line.getStart_time() == null) - line.setStart_time(curTime); - line.setEnd_lat(lat); - line.setEnd_lon(lon); - line.setEnd_time(curTime); - } - this.createLine(voyage,ds, line, heigth, index); - } else { - // 找出所有航线 - String dv_sn = file_name.replace(".txt", "").replace("_Clean", ""); - List sdArray = this.mDataset.listByColumn("diving_sn", dv_sn); - if (sdArray.size() == 0) { - throw new BusinessException("未找到潜次[" + dv_sn + "]对应的数据集！"); - - } else { - for (SampleDataset ds : sdArray) { - int index = 1; - List navArray = new ArrayList<>(); - for (int i = 0; i < array.size(); i++) { - if (array.get(i).trim().length() == 0) { - this.update(file_name, ds, index, navArray); - break; - } - String[] values = HmeStringHelper.splitWithSpace(array.get(i)); - if (values[0].equals(">>")) { - this.update(file_name, ds, index, navArray); - navArray = new ArrayList<>(); - index++; - continue; - } - if (values.length < 3) { - throwError(i, "列不足，至少需要3列"); - } - - // 110.565232 17.370000 2023-05-20-13:55:27 - String lon = values[0]; - String lat = values[1]; - String time = values[2]; - // 经纬度的范围包括经度范围0°-180°和纬度范围0°-90° - try { - double d = Double.parseDouble(lon); - if (d > 180) - throwError(i, "经度[" + lon + "]不能大于 180°"); - if (d < 0) - throwError(i, "经度[" + lon + "]不能小于 0°"); - } catch (Exception e) { - throwError(i, "经度[" + lon + "]格式错误"); - } - - try { - double d = Double.parseDouble(lat); - if (d > 90) - throwError(i, "纬度[" + lat + "]不能大于 90°"); - if (d < 0) - throwError(i, "纬度[" + lat + "]不能小于 0°"); - } catch (Exception e) { - throwError(i, "纬度[" + lat + "]格式错误"); - } - // 109.49100 18.23400 2023-09-18-21:58:35 - String[] vs = time.split("-"); - if (vs.length != 4) - throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); - LocalDateTime curTime = HmeLocalDateHelper.parseDateTime(vs[0] + "-" + vs[1] + "-" + vs[2] + " " + vs[3]); - if (curTime == null) - throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); - // 判断通过 - - SampleLineTrack nav = new SampleLineTrack(); - nav.setTrack_lat(lat); - nav.setTrack_lon(lon); - nav.setTrack_time(curTime); - navArray.add(nav); - } - } - } - } - - return new ArrayList<>(); - } - - public void createLine(VoyageReg voyage,SampleDataset ds, SampleLine line, String heigth, int index) { - line.setCreate_time(LocalDateTime.now()); - line.setDataset_id(ds.getTsy_id()); - line.setFunding_org(voyage.getFunding_org()); - line.setDataset_name(ds.getDataset_name()); - line.setLine_deep(heigth); - line.setPublish_rule("不公开"); - line.setSample_status("原始数据"); - line.setSample_seq(HmeStringHelper.leftPad(index + "", 2, '0')); - line.setLine_sn(line.getSample_seq()); - line.setSample_name(ds.getDataset_name() + "_" + line.getSample_seq()); - this.mLine.insert(line); - } - - public void update(String file_name, SampleDataset ds, int index, List navArray) { - if (navArray.size() == 0) - return; - // 查找是否有对应的测线 - String sn = HmeStringHelper.leftPad(index + "", 2, '0'); - List lineArray = this.mLine.list(SqlQuery.create().addCondition("dataset_id", ds.getTsy_id()).addCondition("sample_seq", sn)); - if (lineArray.size() > 0) { - for (SampleLineTrack nav : navArray) { - nav.setDataset_id(ds.getTsy_id()); - nav.setTrack_index(sn); - nav.setLine_id(lineArray.get(0).getTsy_id()); - this.mTrack.insert(nav); - } - SampleLine line = new SampleLine(); - line.setTsy_id(lineArray.get(0).getTsy_id()); - line.setTrack_file_name(file_name); - this.mLine.update(line); - - } - navArray = new ArrayList<>(); - } - - public void throwError(int row, String msg) { - throw new BusinessException("测线轨迹文件导入失败->第[" + (row + 1) + "]行:" + msg); - - } - -} +package cn.tsy.cas.idsse.dsds.service.sample; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.helper.HmeFrameAssertHelper; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.helper.log.HmeLogHelper; +import cn.hme.framework.helper.time.HmeLocalDateHelper; +import cn.hme.framework.jdbc.entity.SqlQuery; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleLineMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleLineTrackMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleLine; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleLineTrack; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; + +@Service +public class SampleLineTrackService { + @Autowired + private ISampleLineTrackMapper mTrack; + @Autowired + private ISampleLineMapper mLine; + @Autowired + private IVoyageRegMapper mVoyage; + @Autowired + private ISampleDatasetMapper mDataset; + + public List uploadTrack(int dataset_id, List array, String file_name) { + HmeFrameAssertHelper.hasValue(array, "测线轨迹文件为空，请检查！"); + if (file_name.toLowerCase().endsWith("m.txt")) { + SampleDataset ds = this.mDataset.find(dataset_id); + if (ds == null) { + throw new BusinessException("未找到对应的数据集信息！"); + } + VoyageReg voyage = this.mVoyage.find(ds.getVoyage_id()); + String heigth = file_name.replace(".txt", "").replaceAll("m", "").split("_")[1]; + // 判断是否已经输入了 + this.mLine.deleteByColumn("dataset_id", dataset_id); + int index = 1; + SampleLine line = new SampleLine(); + for (int i = 0; i < array.size(); i++) { + if (array.get(i).trim().length() == 0) { + break; + } + String[] values = HmeStringHelper.splitWithSpace(array.get(i)); + if (values[0].equals(">>")) { + this.createLine(voyage,ds, line, heigth, index); + line = new SampleLine(); + HmeLogHelper.info("dataset_index:"+index); + index++; + continue; + } + String lon = values[0]; + String lat = values[1]; + String time = values[2]; + // 经纬度的范围包括经度范围0°-180°和纬度范围0°-90° + try { + double d = Double.parseDouble(lon); + if (d > 180) + throwError(i, "经度[" + lon + "]不能大于 180°"); + if (d < 0) + throwError(i, "经度[" + lon + "]不能小于 0°"); + } catch (Exception e) { + throwError(i, "经度[" + lon + "]格式错误"); + } + + try { + double d = Double.parseDouble(lat); + if (d > 90) + throwError(i, "纬度[" + lat + "]不能大于 90°"); + if (d < 0) + throwError(i, "纬度[" + lat + "]不能小于 0°"); + } catch (Exception e) { + throwError(i, "纬度[" + lat + "]格式错误"); + } + // 109.49100 18.23400 2023-09-18-21:58:35 + String[] vs = time.split("-"); + if (vs.length != 4) + throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); + LocalDateTime curTime = HmeLocalDateHelper.parseDateTime(vs[0] + "-" + vs[1] + "-" + vs[2] + " " + vs[3]); + if (curTime == null) + throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); + // 判断通过 + if (values.length < 3) { + throwError(i, "列不足，至少需要3列"); + } + if (line.getStart_lat() == null) + line.setStart_lat(lat); + if (line.getStart_lon() == null) + line.setStart_lon(lon); + if (line.getStart_time() == null) + line.setStart_time(curTime); + line.setEnd_lat(lat); + line.setEnd_lon(lon); + line.setEnd_time(curTime); + } + this.createLine(voyage,ds, line, heigth, index); + } else { + // 找出所有航线 + String dv_sn = file_name.replace(".txt", "").replace("_Clean", ""); + List sdArray = this.mDataset.listByColumn("diving_sn", dv_sn); + if (sdArray.size() == 0) { + throw new BusinessException("未找到潜次[" + dv_sn + "]对应的数据集！"); + + } else { + for (SampleDataset ds : sdArray) { + int index = 1; + List navArray = new ArrayList<>(); + for (int i = 0; i < array.size(); i++) { + if (array.get(i).trim().length() == 0) { + this.update(file_name, ds, index, navArray); + break; + } + String[] values = HmeStringHelper.splitWithSpace(array.get(i)); + if (values[0].equals(">>")) { + this.update(file_name, ds, index, navArray); + navArray = new ArrayList<>(); + index++; + continue; + } + if (values.length < 3) { + throwError(i, "列不足，至少需要3列"); + } + + // 110.565232 17.370000 2023-05-20-13:55:27 + String lon = values[0]; + String lat = values[1]; + String time = values[2]; + // 经纬度的范围包括经度范围0°-180°和纬度范围0°-90° + try { + double d = Double.parseDouble(lon); + if (d > 180) + throwError(i, "经度[" + lon + "]不能大于 180°"); + if (d < 0) + throwError(i, "经度[" + lon + "]不能小于 0°"); + } catch (Exception e) { + throwError(i, "经度[" + lon + "]格式错误"); + } + + try { + double d = Double.parseDouble(lat); + if (d > 90) + throwError(i, "纬度[" + lat + "]不能大于 90°"); + if (d < 0) + throwError(i, "纬度[" + lat + "]不能小于 0°"); + } catch (Exception e) { + throwError(i, "纬度[" + lat + "]格式错误"); + } + // 109.49100 18.23400 2023-09-18-21:58:35 + String[] vs = time.split("-"); + if (vs.length != 4) + throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); + LocalDateTime curTime = HmeLocalDateHelper.parseDateTime(vs[0] + "-" + vs[1] + "-" + vs[2] + " " + vs[3]); + if (curTime == null) + throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); + // 判断通过 + + SampleLineTrack nav = new SampleLineTrack(); + nav.setTrack_lat(lat); + nav.setTrack_lon(lon); + nav.setTrack_time(curTime); + navArray.add(nav); + } + } + } + } + + return new ArrayList<>(); + } + + public void createLine(VoyageReg voyage,SampleDataset ds, SampleLine line, String heigth, int index) { + line.setCreate_time(LocalDateTime.now()); + line.setDataset_id(ds.getTsy_id()); + line.setFunding_org(voyage.getFunding_org()); + line.setDataset_name(ds.getDataset_name()); + line.setLine_deep(heigth); + line.setPublish_rule("不公开"); + line.setSample_status("原始数据"); + line.setSample_seq(HmeStringHelper.leftPad(index + "", 2, '0')); + line.setLine_sn(line.getSample_seq()); + line.setSample_name(ds.getDataset_name() + "_" + line.getSample_seq()); + this.mLine.insert(line); + } + + public void update(String file_name, SampleDataset ds, int index, List navArray) { + if (navArray.size() == 0) + return; + // 查找是否有对应的测线 + String sn = HmeStringHelper.leftPad(index + "", 2, '0'); + List lineArray = this.mLine.list(SqlQuery.create().addCondition("dataset_id", ds.getTsy_id()).addCondition("sample_seq", sn)); + if (lineArray.size() > 0) { + for (SampleLineTrack nav : navArray) { + nav.setDataset_id(ds.getTsy_id()); + nav.setTrack_index(sn); + nav.setLine_id(lineArray.get(0).getTsy_id()); + this.mTrack.insert(nav); + } + SampleLine line = new SampleLine(); + line.setTsy_id(lineArray.get(0).getTsy_id()); + line.setTrack_file_name(file_name); + this.mLine.update(line); + + } + navArray = new ArrayList<>(); + } + + public void throwError(int row, String msg) { + throw new BusinessException("测线轨迹文件导入失败->第[" + (row + 1) + "]行:" + msg); + + } + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleStationService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleStationService.java index eb7837f..8381c7d 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleStationService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleStationService.java @@ -1,59 +1,59 @@ -package cn.tsy.cas.idsse.dsds.service.sample; - -import java.time.LocalDateTime; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.data.frame.model.HmeFrameOptr; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.jdbc.entity.SqlCondition; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleStationMapper; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleStation; - -@Service -public class SampleStationService { - @Autowired - private ISampleDatasetMapper mDataset; - @Autowired - private ISampleStationMapper mStation; - - /*********************** - * 增加或者修改 - * - */ - public SampleStation editStation(int dataset_id, SampleStation satation, HmeFrameOptr optr) { - SampleDataset dataset = this.mDataset.find(dataset_id); - if (satation.getTsy_id() == null) { - // 计算序号 - Integer total = this.mStation.count(SqlCondition.of("dataset_id", dataset_id)); - String seq = "01"; - if (total != null && total > 0) - seq = HmeStringHelper.leftPad((total + 1)+"", 2, '0'); - satation.setDataset_id(dataset_id); - satation.setDataset_name(dataset.getDataset_name()); - satation.setSample_seq(seq); - satation.setSample_name(dataset.getDataset_name()+"_"+seq); - satation.setCreate_time(LocalDateTime.now()); - this.mStation.insert(satation); - }else - this.mStation.update(satation); - - return satation; - - } - - /**************** - * 删除数据样品 - * - */ - public void deleteStation(int satation_id) { - /**************** - * @todo 判断是否能实际删除 - */ - this.mStation.delete(satation_id); - } - -} +package cn.tsy.cas.idsse.dsds.service.sample; + +import java.time.LocalDateTime; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.data.frame.model.HmeFrameOptr; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.jdbc.entity.SqlCondition; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleStationMapper; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleStation; + +@Service +public class SampleStationService { + @Autowired + private ISampleDatasetMapper mDataset; + @Autowired + private ISampleStationMapper mStation; + + /*********************** + * 增加或者修改 + * + */ + public SampleStation editStation(int dataset_id, SampleStation satation, HmeFrameOptr optr) { + SampleDataset dataset = this.mDataset.find(dataset_id); + if (satation.getTsy_id() == null) { + // 计算序号 + Integer total = this.mStation.count(SqlCondition.of("dataset_id", dataset_id)); + String seq = "01"; + if (total != null && total > 0) + seq = HmeStringHelper.leftPad((total + 1)+"", 2, '0'); + satation.setDataset_id(dataset_id); + satation.setDataset_name(dataset.getDataset_name()); + satation.setSample_seq(seq); + satation.setSample_name(dataset.getDataset_name()+"_"+seq); + satation.setCreate_time(LocalDateTime.now()); + this.mStation.insert(satation); + }else + this.mStation.update(satation); + + return satation; + + } + + /**************** + * 删除数据样品 + * + */ + public void deleteStation(int satation_id) { + /**************** + * @todo 判断是否能实际删除 + */ + this.mStation.delete(satation_id); + } + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageMemberService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageMemberService.java index 2d2269c..5722196 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageMemberService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageMemberService.java @@ -1,102 +1,102 @@ -package cn.tsy.cas.idsse.dsds.service.voyage; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.data.frame.model.HmeFrameOptr; -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.helper.HmeFrameAssertHelper; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.helper.time.HmeLocalDateHelper; -import cn.tsy.cas.idsse.dsds.constant.VoyageLogType; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictUnitSailMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageLogMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageMemberMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictUnitSail; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageMember; - -@Service -public class VoyageMemberService { - @Autowired - private IVoyageMemberMapper mMember; - @Autowired - private IDictUnitSailMapper iUnit; - @Autowired - private IVoyageLogMapper mLog; - - public List uploadMember(int voyage_id, List> values, HmeFrameOptr optr) { - HmeFrameAssertHelper.hasValue(values, "参航人员数量为空，请检查！"); - LocalDate startDate = HmeLocalDateHelper.parseDate("1900-01-01"); - this.mMember.deleteByColumn("voyage_id", voyage_id); - List memberArray = new ArrayList<>(); - for (int i = 0; i < values.size(); i++) { - List list = values.get(i); - if (list.get(0) == null || list.get(0).trim().length() == 0) - break; - - VoyageMember m = new VoyageMember(); - m.setMember_name(list.get(0)); - m.setMember_sex(list.get(1)); - String date= list.get(2); - if(date!=null) { - // 判断是不是日期 - - try { - //System.out.println(HmeLocalDateHelper.format(startDate.plusDays(Integer.parseInt(date)))); - m.setMember_birthday(HmeLocalDateHelper.format(startDate.plusDays(Integer.parseInt(date)))); - }catch(Exception e) { - } - if(m.getMember_birthday()==null) - m.setMember_birthday(date); - } - m.setMember_unit(list.get(3)); - m.setMember_dept(list.get(4)); -// m.setShip_room_addr(list.get(5)); -// m.setMember_tel(list.get(6)); -// m.setMember_cert(list.get(7)); -// m.setBank_name(list.get(8)); -// m.setBank_card(list.get(9)); -// m.setBank_addr(list.get(10)); - m.setMember_remark(list.get(5)); - m.setVoyage_id(voyage_id); - - this.mMember.insert(m); - // 判断是否需要增加参航单位 - if(HmeStringHelper.hasValue(m.getMember_unit())) { - if(this.iUnit.listByColumn("unit_name", m.getMember_unit()).size()>0) { - DictUnitSail unit = new DictUnitSail(); - unit.setUnit_name(m.getMember_unit()); - unit.setCreate_time(LocalDateTime.now()); - this.iUnit.insert(m); - } - } - - memberArray.add(m); - } - if (memberArray.size() > 0) - VoyageRegService.logVoyage(mLog, voyage_id, optr, VoyageLogType.UploadMember, "成功导入[" + memberArray.size() + "]条参航人员"); - return memberArray; - } - - public void throwError(int row, String msg) { - throw new BusinessException("航次参航人员导入失败->第[" + (row + 1) + "]行:" + msg); - - } - - - public void editMember(VoyageMember member) { - if(member.getTsy_id()==null) - this.mMember.insert(member); - else this.mMember.update(member); - } - - public void deleteMember(int member_id) { - this.mMember.delete(member_id); - } - -} +package cn.tsy.cas.idsse.dsds.service.voyage; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.data.frame.model.HmeFrameOptr; +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.helper.HmeFrameAssertHelper; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.helper.time.HmeLocalDateHelper; +import cn.tsy.cas.idsse.dsds.constant.VoyageLogType; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictUnitSailMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageLogMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageMemberMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictUnitSail; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageMember; + +@Service +public class VoyageMemberService { + @Autowired + private IVoyageMemberMapper mMember; + @Autowired + private IDictUnitSailMapper iUnit; + @Autowired + private IVoyageLogMapper mLog; + + public List uploadMember(int voyage_id, List> values, HmeFrameOptr optr) { + HmeFrameAssertHelper.hasValue(values, "参航人员数量为空，请检查！"); + LocalDate startDate = HmeLocalDateHelper.parseDate("1900-01-01"); + this.mMember.deleteByColumn("voyage_id", voyage_id); + List memberArray = new ArrayList<>(); + for (int i = 0; i < values.size(); i++) { + List list = values.get(i); + if (list.get(0) == null || list.get(0).trim().length() == 0) + break; + + VoyageMember m = new VoyageMember(); + m.setMember_name(list.get(0)); + m.setMember_sex(list.get(1)); + String date= list.get(2); + if(date!=null) { + // 判断是不是日期 + + try { + //System.out.println(HmeLocalDateHelper.format(startDate.plusDays(Integer.parseInt(date)))); + m.setMember_birthday(HmeLocalDateHelper.format(startDate.plusDays(Integer.parseInt(date)))); + }catch(Exception e) { + } + if(m.getMember_birthday()==null) + m.setMember_birthday(date); + } + m.setMember_unit(list.get(3)); + m.setMember_dept(list.get(4)); +// m.setShip_room_addr(list.get(5)); +// m.setMember_tel(list.get(6)); +// m.setMember_cert(list.get(7)); +// m.setBank_name(list.get(8)); +// m.setBank_card(list.get(9)); +// m.setBank_addr(list.get(10)); + m.setMember_remark(list.get(5)); + m.setVoyage_id(voyage_id); + + this.mMember.insert(m); + // 判断是否需要增加参航单位 + if(HmeStringHelper.hasValue(m.getMember_unit())) { + if(this.iUnit.listByColumn("unit_name", m.getMember_unit()).size()>0) { + DictUnitSail unit = new DictUnitSail(); + unit.setUnit_name(m.getMember_unit()); + unit.setCreate_time(LocalDateTime.now()); + this.iUnit.insert(m); + } + } + + memberArray.add(m); + } + if (memberArray.size() > 0) + VoyageRegService.logVoyage(mLog, voyage_id, optr, VoyageLogType.UploadMember, "成功导入[" + memberArray.size() + "]条参航人员"); + return memberArray; + } + + public void throwError(int row, String msg) { + throw new BusinessException("航次参航人员导入失败->第[" + (row + 1) + "]行:" + msg); + + } + + + public void editMember(VoyageMember member) { + if(member.getTsy_id()==null) + this.mMember.insert(member); + else this.mMember.update(member); + } + + public void deleteMember(int member_id) { + this.mMember.delete(member_id); + } + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageNavigationService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageNavigationService.java index 7929399..689b3b5 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageNavigationService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageNavigationService.java @@ -1,115 +1,115 @@ -package cn.tsy.cas.idsse.dsds.service.voyage; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.data.frame.model.HmeFrameOptr; -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.helper.HmeFrameAssertHelper; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.helper.time.HmeLocalDateHelper; -import cn.tsy.cas.idsse.dsds.constant.VoyageLogType; -import cn.tsy.cas.idsse.dsds.helper.DSDSGeoCalculator; -import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictGeomMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageLogMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageNavigationMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageNavigation; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; - -@Service -public class VoyageNavigationService { - @Autowired - private IVoyageNavigationMapper mNav; - @Autowired - private IVoyageRegMapper mVoyage; - @Autowired - private IVoyageLogMapper mLog; - @Autowired - private IDictGeomMapper iGeom; - - public List uploadNavigation(int voyage_id, List array, String file_name, - HmeFrameOptr optr) { - HmeFrameAssertHelper.hasValue(array, "航次导航文件为空，请检查！"); - List navArray = new ArrayList<>(); - this.mNav.deleteByColumn("voyage_id", voyage_id); - for (int i = 0; i < array.size(); i++) { - if (array.get(i).trim().length() == 0) - break; - String[] values = HmeStringHelper.splitWithSpace(array.get(i)); - if (values.length < 3) { - throwError(i, "列不足，至少需要3列"); - } - - String lon = values[0]; - String lat = values[1]; - String time = values[2]; - // 经纬度的范围包括经度范围0°-180°和纬度范围0°-90° -// try { -// double d = Double.parseDouble(lon); -// if (d > 180) -// throwError(i, "经度[" + lon + "]不能大于 180°"); -// if (d < 0) -// throwError(i, "经度[" + lon + "]不能小于 0°"); -// } catch (Exception e) { -// throwError(i, "经度[" + lon + "]格式错误"); -// } - -// try { -// double d = Double.parseDouble(lat); -// if (d > 90) -// throwError(i, "纬度[" + lat + "]不能大于 90°"); -// if (d < 0) -// throwError(i, "纬度[" + lat + "]不能小于 0°"); -// } catch (Exception e) { -// throwError(i, "纬度[" + lat + "]格式错误"); -// } - // 109.49100 18.23400 2023-09-18-21:58:35 - String[] vs = time.split("-"); - if (vs.length != 4) - throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); - LocalDateTime curTime = HmeLocalDateHelper - .parseDateTime(vs[0] + "-" + vs[1] + "-" + vs[2] + " " + vs[3].replace(".000", "")); - if (curTime == null) - throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); - // 判断通过 - VoyageNavigation nav = new VoyageNavigation(); - nav.setNav_lat(lat); - nav.setNav_lon(lon); - nav.setNav_time(curTime); - nav.setVoyage_id(voyage_id); - // 判断时间是否重复了 -// List vArray = this.mNav.selectList(SqlBuilder.create().addSqlCondition(SqlCondition.of("voyage_id", voyage_id)).addSqlCondition(SqlCondition.of("nav_time", curTime))); -// if (vArray.size() == 0) { - this.mNav.insert(nav); - navArray.add(nav); -// } - } - if (navArray.size() > 0) { - VoyageReg voyage = new VoyageReg(); - voyage.setTsy_id(voyage_id); - voyage.setNavigation_file_name(file_name); - // 计算海里数目 - Double dValue = DSDSGeoCalculator.calcuateVoyage(navArray); - voyage.setVoyage_mileage(dValue.intValue()); - this.mVoyage.update(voyage); - // 写入图层 - this.iGeom.createVoyage(this.mVoyage.find(voyage_id).getVoyage_name()); - - VoyageRegService.logVoyage(mLog, voyage_id, optr, VoyageLogType.UploadNavigation, - "成功导入[" + navArray.size() + "]条导航记录"); - - } - return navArray; - } - - public void throwError(int row, String msg) { - throw new BusinessException("航次导航文件导入失败->第[" + (row + 1) + "]行:" + msg); - - } - -} +package cn.tsy.cas.idsse.dsds.service.voyage; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.data.frame.model.HmeFrameOptr; +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.helper.HmeFrameAssertHelper; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.helper.time.HmeLocalDateHelper; +import cn.tsy.cas.idsse.dsds.constant.VoyageLogType; +import cn.tsy.cas.idsse.dsds.helper.DSDSGeoCalculator; +import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictGeomMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageLogMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageNavigationMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageNavigation; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; + +@Service +public class VoyageNavigationService { + @Autowired + private IVoyageNavigationMapper mNav; + @Autowired + private IVoyageRegMapper mVoyage; + @Autowired + private IVoyageLogMapper mLog; + @Autowired + private IDictGeomMapper iGeom; + + public List uploadNavigation(int voyage_id, List array, String file_name, + HmeFrameOptr optr) { + HmeFrameAssertHelper.hasValue(array, "航次导航文件为空，请检查！"); + List navArray = new ArrayList<>(); + this.mNav.deleteByColumn("voyage_id", voyage_id); + for (int i = 0; i < array.size(); i++) { + if (array.get(i).trim().length() == 0) + break; + String[] values = HmeStringHelper.splitWithSpace(array.get(i)); + if (values.length < 3) { + throwError(i, "列不足，至少需要3列"); + } + + String lon = values[0]; + String lat = values[1]; + String time = values[2]; + // 经纬度的范围包括经度范围0°-180°和纬度范围0°-90° +// try { +// double d = Double.parseDouble(lon); +// if (d > 180) +// throwError(i, "经度[" + lon + "]不能大于 180°"); +// if (d < 0) +// throwError(i, "经度[" + lon + "]不能小于 0°"); +// } catch (Exception e) { +// throwError(i, "经度[" + lon + "]格式错误"); +// } + +// try { +// double d = Double.parseDouble(lat); +// if (d > 90) +// throwError(i, "纬度[" + lat + "]不能大于 90°"); +// if (d < 0) +// throwError(i, "纬度[" + lat + "]不能小于 0°"); +// } catch (Exception e) { +// throwError(i, "纬度[" + lat + "]格式错误"); +// } + // 109.49100 18.23400 2023-09-18-21:58:35 + String[] vs = time.split("-"); + if (vs.length != 4) + throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); + LocalDateTime curTime = HmeLocalDateHelper + .parseDateTime(vs[0] + "-" + vs[1] + "-" + vs[2] + " " + vs[3].replace(".000", "")); + if (curTime == null) + throwError(i, "时间[" + time + "]格式错误，样例 2023-09-18-21:58:35"); + // 判断通过 + VoyageNavigation nav = new VoyageNavigation(); + nav.setNav_lat(lat); + nav.setNav_lon(lon); + nav.setNav_time(curTime); + nav.setVoyage_id(voyage_id); + // 判断时间是否重复了 +// List vArray = this.mNav.selectList(SqlBuilder.create().addSqlCondition(SqlCondition.of("voyage_id", voyage_id)).addSqlCondition(SqlCondition.of("nav_time", curTime))); +// if (vArray.size() == 0) { + this.mNav.insert(nav); + navArray.add(nav); +// } + } + if (navArray.size() > 0) { + VoyageReg voyage = new VoyageReg(); + voyage.setTsy_id(voyage_id); + voyage.setNavigation_file_name(file_name); + // 计算海里数目 + Double dValue = DSDSGeoCalculator.calcuateVoyage(navArray); + voyage.setVoyage_mileage(dValue.intValue()); + this.mVoyage.update(voyage); + // 写入图层 + this.iGeom.createVoyage(this.mVoyage.find(voyage_id).getVoyage_name()); + + VoyageRegService.logVoyage(mLog, voyage_id, optr, VoyageLogType.UploadNavigation, + "成功导入[" + navArray.size() + "]条导航记录"); + + } + return navArray; + } + + public void throwError(int row, String msg) { + throw new BusinessException("航次导航文件导入失败->第[" + (row + 1) + "]行:" + msg); + + } + +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageRegOptrService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageRegOptrService.java index 6bacd46..0090fdc 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageRegOptrService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageRegOptrService.java @@ -1,27 +1,27 @@ -package cn.tsy.cas.idsse.dsds.service.voyage; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegOptrMapper; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageRegOptr; - -@Service -public class VoyageRegOptrService { - @Autowired - private IVoyageRegOptrMapper iOptr; - - public void save(int optr_id,Integer[] voyage_ids) { - this.iOptr.deleteByColumn("optr_id", optr_id); - for(int voyage_id:voyage_ids ) { - VoyageRegOptr m = new VoyageRegOptr(); - m.setVoyage_id(voyage_id); - m.setOptr_id(optr_id); - this.iOptr.insert(m); - } - } - - public void clear(int optr_id) { - this.iOptr.deleteByColumn("optr_id", optr_id); - } -} +package cn.tsy.cas.idsse.dsds.service.voyage; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegOptrMapper; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageRegOptr; + +@Service +public class VoyageRegOptrService { + @Autowired + private IVoyageRegOptrMapper iOptr; + + public void save(int optr_id,Integer[] voyage_ids) { + this.iOptr.deleteByColumn("optr_id", optr_id); + for(int voyage_id:voyage_ids ) { + VoyageRegOptr m = new VoyageRegOptr(); + m.setVoyage_id(voyage_id); + m.setOptr_id(optr_id); + this.iOptr.insert(m); + } + } + + public void clear(int optr_id) { + this.iOptr.deleteByColumn("optr_id", optr_id); + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageRegService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageRegService.java index 0814de5..c46ef9c 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageRegService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/voyage/VoyageRegService.java @@ -1,134 +1,134 @@ -package cn.tsy.cas.idsse.dsds.service.voyage; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.data.frame.model.HmeFrameOptr; -import cn.hme.framework.exception.BusinessException; -import cn.hme.framework.frame.constant.HmeFrameStatus; -import cn.hme.framework.frame.helper.HmeFrameAssertHelper; -import cn.hme.framework.helper.time.HmeLocalDateHelper; -import cn.tsy.cas.idsse.dsds.constant.VoyageLogType; -import cn.tsy.cas.idsse.dsds.constant.VoyageStatus; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageLogMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageLog; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageMember; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageNavigation; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; - -@Service -public class VoyageRegService { - @Autowired - private IVoyageRegMapper mReg; - @Autowired - private IVoyageLogMapper mLog; - - /*********************** - * 增加或者修改 - */ - public void editVoyage(VoyageReg voyage, HmeFrameOptr optr) { - HmeFrameAssertHelper.isNotEmpty(voyage.getVoyage_name(), "航次名称不允许为空！"); - HmeFrameAssertHelper.isNotNull(voyage.getVoyage_start_date(), "航次离港日期不允许为空！"); - HmeFrameAssertHelper.isNotNull(voyage.getVoyage_end_date(), "航次返岗日期不允许为空！"); - if (voyage.getVoyage_end_date().isBefore(voyage.getVoyage_start_date())) - throw new BusinessException("航次返港日期不能小于离港日期！"); - // 判断类型是否存在 - List list = this.mReg.listByColumn("voyage_name", voyage.getVoyage_name()); - if (voyage.getTsy_id() != null) { - if (list.size() > 0 && list.get(0).getTsy_id() - voyage.getTsy_id() != 0) - throw new BusinessException("航次名称【" + voyage.getVoyage_name() + "】已经存在，请检查！"); - this.mReg.update(voyage); - } else { - HmeFrameAssertHelper.isEmpty(list, "航次名称名称【" + voyage.getVoyage_name() + "】已经存在，请检查！"); - voyage.setCreate_time(LocalDateTime.now()); - voyage.setVoyage_status(VoyageStatus.Plan); - voyage.setVoyage_status_time(LocalDateTime.now()); - // 计算日期 - voyage.setVoyage_days(HmeLocalDateHelper.calTimeDiff(voyage.getVoyage_end_date(), voyage.getVoyage_start_date()).intValue()); - this.mReg.insert(voyage); - /*************** - * 写航次日志 - */ - logVoyage(this.mLog, voyage.getTsy_id(), optr, VoyageLogType.Create, voyage.getTsy_id() + "->" + voyage.getVoyage_name()); - - } - } - - // 航次名称 科考船舶 涉密航次 航次任务简述 开始时间 结束时间 航次首席 航次资助机构 资助编号 - public List uploadVoyage(List> values) { - List array = new ArrayList(); - for (int i = 0; i < values.size(); i++) { - List list = values.get(i); - if (list.get(0) == null || list.get(0).trim().length() == 0) - break; - String voyage_name = list.get(0); - String ship_name = list.get(1); - String secure_flag = list.get(2); - String remark = list.get(3); - String start_date = list.get(4); - String end_date = list.get(5); - String voyage_officer = list.get(6); - String funding_org = list.get(7); - String funding_code = list.get(8); - List vArray = this.mReg.listByColumn("voyage_name", voyage_name); - VoyageReg reg = null; - - if(vArray.size()>0) - reg = vArray.get(0); - else - reg = new VoyageReg(); - reg.setCreate_time(LocalDateTime.now()); - reg.setFunding_code(funding_code); - reg.setFunding_org(funding_org); - reg.setSerect_status("是".equals(secure_flag)?HmeFrameStatus.Active.toString():HmeFrameStatus.InActive.toString()); - reg.setShip_name(ship_name); - reg.setVoyage_end_date(HmeLocalDateHelper.parseDate(end_date)); - reg.setVoyage_start_date(HmeLocalDateHelper.parseDate(start_date)); - reg.setVoyage_name(voyage_name); - reg.setVoyage_officer(voyage_officer); - reg.setVoyage_remark(remark); - reg.setVoyage_status("Plan"); - reg.setVoyage_status_time(LocalDateTime.now()); - - reg.setVoyage_days(HmeLocalDateHelper.calTimeDiff(reg.getVoyage_end_date(), reg.getVoyage_start_date()).intValue()); - if(reg.getTsy_id()==null) - this.mReg.insert(reg); - else - this.mReg.update(reg); - array.add(reg); - - } - return array; - } - - /**************** - * 删除航次信息 - * - */ - public void deleteVoyage(int voyage_id) { - /**************** - * @todo 判断是否能实际删除 - */ - this.mLog.deleteByColumn("voyage_id", voyage_id); - this.mLog.deleteOtherByColumn(VoyageNavigation.class, "voyage_id", voyage_id); - this.mLog.deleteOtherByColumn(VoyageMember.class, "voyage_id", voyage_id); - this.mReg.delete(voyage_id); - } - - public static VoyageLog logVoyage(IVoyageLogMapper mLog, int voyage_id, HmeFrameOptr optr, String log_type, String log_value) { - VoyageLog log = new VoyageLog(); - log.setLog_type(log_type); - log.setLog_value(log_value); - log.setLogin_name(optr.getLogin_name()); - log.setOptr_id(optr.getOptr_id()); - log.setOptr_name(optr.getOptr_name()); - log.setVoyage_id(voyage_id); - mLog.insert(log); - return log; - } -} +package cn.tsy.cas.idsse.dsds.service.voyage; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.data.frame.model.HmeFrameOptr; +import cn.hme.framework.exception.BusinessException; +import cn.hme.framework.frame.constant.HmeFrameStatus; +import cn.hme.framework.frame.helper.HmeFrameAssertHelper; +import cn.hme.framework.helper.time.HmeLocalDateHelper; +import cn.tsy.cas.idsse.dsds.constant.VoyageLogType; +import cn.tsy.cas.idsse.dsds.constant.VoyageStatus; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageLogMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageLog; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageMember; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageNavigation; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; + +@Service +public class VoyageRegService { + @Autowired + private IVoyageRegMapper mReg; + @Autowired + private IVoyageLogMapper mLog; + + /*********************** + * 增加或者修改 + */ + public void editVoyage(VoyageReg voyage, HmeFrameOptr optr) { + HmeFrameAssertHelper.isNotEmpty(voyage.getVoyage_name(), "航次名称不允许为空！"); + HmeFrameAssertHelper.isNotNull(voyage.getVoyage_start_date(), "航次离港日期不允许为空！"); + HmeFrameAssertHelper.isNotNull(voyage.getVoyage_end_date(), "航次返岗日期不允许为空！"); + if (voyage.getVoyage_end_date().isBefore(voyage.getVoyage_start_date())) + throw new BusinessException("航次返港日期不能小于离港日期！"); + // 判断类型是否存在 + List list = this.mReg.listByColumn("voyage_name", voyage.getVoyage_name()); + if (voyage.getTsy_id() != null) { + if (list.size() > 0 && list.get(0).getTsy_id() - voyage.getTsy_id() != 0) + throw new BusinessException("航次名称【" + voyage.getVoyage_name() + "】已经存在，请检查！"); + this.mReg.update(voyage); + } else { + HmeFrameAssertHelper.isEmpty(list, "航次名称名称【" + voyage.getVoyage_name() + "】已经存在，请检查！"); + voyage.setCreate_time(LocalDateTime.now()); + voyage.setVoyage_status(VoyageStatus.Plan); + voyage.setVoyage_status_time(LocalDateTime.now()); + // 计算日期 + voyage.setVoyage_days(HmeLocalDateHelper.calTimeDiff(voyage.getVoyage_end_date(), voyage.getVoyage_start_date()).intValue()); + this.mReg.insert(voyage); + /*************** + * 写航次日志 + */ + logVoyage(this.mLog, voyage.getTsy_id(), optr, VoyageLogType.Create, voyage.getTsy_id() + "->" + voyage.getVoyage_name()); + + } + } + + // 航次名称 科考船舶 涉密航次 航次任务简述 开始时间 结束时间 航次首席 航次资助机构 资助编号 + public List uploadVoyage(List> values) { + List array = new ArrayList(); + for (int i = 0; i < values.size(); i++) { + List list = values.get(i); + if (list.get(0) == null || list.get(0).trim().length() == 0) + break; + String voyage_name = list.get(0); + String ship_name = list.get(1); + String secure_flag = list.get(2); + String remark = list.get(3); + String start_date = list.get(4); + String end_date = list.get(5); + String voyage_officer = list.get(6); + String funding_org = list.get(7); + String funding_code = list.get(8); + List vArray = this.mReg.listByColumn("voyage_name", voyage_name); + VoyageReg reg = null; + + if(vArray.size()>0) + reg = vArray.get(0); + else + reg = new VoyageReg(); + reg.setCreate_time(LocalDateTime.now()); + reg.setFunding_code(funding_code); + reg.setFunding_org(funding_org); + reg.setSerect_status("是".equals(secure_flag)?HmeFrameStatus.Active.toString():HmeFrameStatus.InActive.toString()); + reg.setShip_name(ship_name); + reg.setVoyage_end_date(HmeLocalDateHelper.parseDate(end_date)); + reg.setVoyage_start_date(HmeLocalDateHelper.parseDate(start_date)); + reg.setVoyage_name(voyage_name); + reg.setVoyage_officer(voyage_officer); + reg.setVoyage_remark(remark); + reg.setVoyage_status("Plan"); + reg.setVoyage_status_time(LocalDateTime.now()); + + reg.setVoyage_days(HmeLocalDateHelper.calTimeDiff(reg.getVoyage_end_date(), reg.getVoyage_start_date()).intValue()); + if(reg.getTsy_id()==null) + this.mReg.insert(reg); + else + this.mReg.update(reg); + array.add(reg); + + } + return array; + } + + /**************** + * 删除航次信息 + * + */ + public void deleteVoyage(int voyage_id) { + /**************** + * @todo 判断是否能实际删除 + */ + this.mLog.deleteByColumn("voyage_id", voyage_id); + this.mLog.deleteOtherByColumn(VoyageNavigation.class, "voyage_id", voyage_id); + this.mLog.deleteOtherByColumn(VoyageMember.class, "voyage_id", voyage_id); + this.mReg.delete(voyage_id); + } + + public static VoyageLog logVoyage(IVoyageLogMapper mLog, int voyage_id, HmeFrameOptr optr, String log_type, String log_value) { + VoyageLog log = new VoyageLog(); + log.setLog_type(log_type); + log.setLog_value(log_value); + log.setLogin_name(optr.getLogin_name()); + log.setOptr_id(optr.getOptr_id()); + log.setOptr_name(optr.getOptr_name()); + log.setVoyage_id(voyage_id); + mLog.insert(log); + return log; + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/thread/DSDSReportThread.java b/src/main/java/cn/tsy/cas/idsse/dsds/thread/DSDSReportThread.java index 71d7a0c..92a193b 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/thread/DSDSReportThread.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/thread/DSDSReportThread.java @@ -1,66 +1,66 @@ -package cn.tsy.cas.idsse.dsds.thread; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import cn.hme.framework.helper.core.HmeSpringHelper; -import cn.hme.framework.helper.thread.HmeThreadHelper; -import cn.hme.framework.jdbc.entity.SqlCondition; -import cn.tsy.cas.idsse.dsds.helper.DSDSParamHelper; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleLineMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleStationMapper; -import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; - -/********************** - * 缓存首页的统计数字 - * @author TsySoft - * @create 2024-09-02 11:13:42 - * @version 1.0.0 - * @email revisit@126.com - * - */ -public class DSDSReportThread implements Runnable{ - - public static Map map = null; - public DSDSReportThread() { - map = new LinkedHashMap(); - } - @Override - public void run() { - - while(true) { - try { - this.report(); - }catch(Exception e) { - - } - HmeThreadHelper.sleepSeconds(DSDSParamHelper.ReportMainTicketSeconds); - } - } - - - private void report() { - // 数据集 - map.put("DatasetTotal", HmeSpringHelper.getBean(ISampleDatasetMapper.class).count()) ; - // 样品数量 - map.put("DataTotal", HmeSpringHelper.getBean(ISampleLineMapper.class).count() - + HmeSpringHelper.getBean(ISampleStationMapper.class).count()) ; - - List> array = HmeSpringHelper.getBean(IVoyageRegMapper.class).totalVoyage(null, null); - if(array.size()>0) { - // 航次个数 - map.put("VoyageTotal",array.get(0).get("voyage_total")) ; - // 航线天数 - map.put("DayTotal",array.get(0).get("day_total")); - // 航行里程 - map.put("MileageTotal",array.get(0).get("mileage_total")); - } - // 深海勇士 - map.put("ShenHaiTotal",HmeSpringHelper.getBean(ISampleDatasetMapper.class).count(SqlCondition.of("platform_name", "深海勇士"))); - // 奋斗者 - map.put("FenDouTotal",HmeSpringHelper.getBean(ISampleDatasetMapper.class).count(SqlCondition.of("platform_name", "奋斗者"))); - - } -} +package cn.tsy.cas.idsse.dsds.thread; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import cn.hme.framework.helper.core.HmeSpringHelper; +import cn.hme.framework.helper.thread.HmeThreadHelper; +import cn.hme.framework.jdbc.entity.SqlCondition; +import cn.tsy.cas.idsse.dsds.helper.DSDSParamHelper; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleDatasetMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleLineMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.sample.ISampleStationMapper; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; + +/********************** + * 缓存首页的统计数字 + * @author TsySoft + * @create 2024-09-02 11:13:42 + * @version 1.0.0 + * @email revisit@126.com + * + */ +public class DSDSReportThread implements Runnable{ + + public static Map map = null; + public DSDSReportThread() { + map = new LinkedHashMap(); + } + @Override + public void run() { + + while(true) { + try { + this.report(); + }catch(Exception e) { + + } + HmeThreadHelper.sleepSeconds(DSDSParamHelper.ReportMainTicketSeconds); + } + } + + + private void report() { + // 数据集 + map.put("DatasetTotal", HmeSpringHelper.getBean(ISampleDatasetMapper.class).count()) ; + // 样品数量 + map.put("DataTotal", HmeSpringHelper.getBean(ISampleLineMapper.class).count() + + HmeSpringHelper.getBean(ISampleStationMapper.class).count()) ; + + List> array = HmeSpringHelper.getBean(IVoyageRegMapper.class).totalVoyage(null, null); + if(array.size()>0) { + // 航次个数 + map.put("VoyageTotal",array.get(0).get("voyage_total")) ; + // 航线天数 + map.put("DayTotal",array.get(0).get("day_total")); + // 航行里程 + map.put("MileageTotal",array.get(0).get("mileage_total")); + } + // 深海勇士 + map.put("ShenHaiTotal",HmeSpringHelper.getBean(ISampleDatasetMapper.class).count(SqlCondition.of("platform_name", "深海勇士"))); + // 奋斗者 + map.put("FenDouTotal",HmeSpringHelper.getBean(ISampleDatasetMapper.class).count(SqlCondition.of("platform_name", "奋斗者"))); + + } +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictDataMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictDataMapper.java index 657b8a1..32c2e53 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictDataMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictDataMapper.java @@ -1,32 +1,32 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.dict; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.constant.SqlProviderConstant; -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.cas.idsse.dsds.control.search.SearchParam; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictData; - -@HmeMapper -public interface IDictDataMapper extends IHmeMapper{ - public Pageable dataWithPage( - @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, - @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, - @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, - @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type - ); - - public Pageable searchWithPage( - @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, - @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, - @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, - @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, - @Param("param") SearchParam param - ); -} +package cn.tsy.data.cas.idsse.dsds.mapper.dict; + +import org.apache.ibatis.annotations.Param; + +import cn.hme.framework.jdbc.constant.SqlProviderConstant; +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.cas.idsse.dsds.control.search.SearchParam; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictData; + +@HmeMapper +public interface IDictDataMapper extends IHmeMapper{ + public Pageable dataWithPage( + @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, + @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, + @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, + @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type + ); + + public Pageable searchWithPage( + @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, + @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, + @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, + @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, + @Param("param") SearchParam param + ); +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictDataMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictDataMapper.xml index b8d4c02..a4ea204 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictDataMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictDataMapper.xml @@ -1,59 +1,59 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictEquipmentMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictEquipmentMapper.java index b5b6644..586190e 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictEquipmentMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictEquipmentMapper.java @@ -1,32 +1,32 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.dict; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.constant.SqlProviderConstant; -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.cas.idsse.dsds.control.search.SearchParam; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictEquipment; - -@HmeMapper -public interface IDictEquipmentMapper extends IHmeMapper{ - public Pageable equipmentWithPage( - @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, - @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, - @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, - @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type - ); - - public Pageable searchWithPage( - @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, - @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, - @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, - @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, - @Param("param") SearchParam param - ); -} +package cn.tsy.data.cas.idsse.dsds.mapper.dict; + +import org.apache.ibatis.annotations.Param; + +import cn.hme.framework.jdbc.constant.SqlProviderConstant; +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.cas.idsse.dsds.control.search.SearchParam; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictEquipment; + +@HmeMapper +public interface IDictEquipmentMapper extends IHmeMapper{ + public Pageable equipmentWithPage( + @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, + @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, + @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, + @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type + ); + + public Pageable searchWithPage( + @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, + @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, + @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, + @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, + @Param("param") SearchParam param + ); +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictEquipmentMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictEquipmentMapper.xml index 6bc4c02..bd977b2 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictEquipmentMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictEquipmentMapper.xml @@ -1,61 +1,61 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictFundingMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictFundingMapper.java index faa1376..79e6b46 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictFundingMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictFundingMapper.java @@ -1,21 +1,21 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.dict; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.constant.SqlProviderConstant; -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictFunding; - -@HmeMapper -public interface IDictFundingMapper extends IHmeMapper{ - public Pageable fundingWithPage( - @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, - @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, - @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, - @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type - ); -} +package cn.tsy.data.cas.idsse.dsds.mapper.dict; + +import org.apache.ibatis.annotations.Param; + +import cn.hme.framework.jdbc.constant.SqlProviderConstant; +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictFunding; + +@HmeMapper +public interface IDictFundingMapper extends IHmeMapper{ + public Pageable fundingWithPage( + @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, + @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, + @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, + @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type + ); +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictFundingMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictFundingMapper.xml index 60bdcb4..42965d8 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictFundingMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictFundingMapper.xml @@ -1,22 +1,22 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictGeomMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictGeomMapper.java index 2c35ff4..fe78f74 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictGeomMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictGeomMapper.java @@ -1,14 +1,14 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.dict; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictGeom; - -@HmeMapper -public interface IDictGeomMapper extends IHmeMapper{ - int createVoyage(@Param("voyage_name") String voyage_name); - - int createDiving(@Param("diving_sn") String diving_sn); -} +package cn.tsy.data.cas.idsse.dsds.mapper.dict; + +import org.apache.ibatis.annotations.Param; + +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictGeom; + +@HmeMapper +public interface IDictGeomMapper extends IHmeMapper{ + int createVoyage(@Param("voyage_name") String voyage_name); + + int createDiving(@Param("diving_sn") String diving_sn); +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictGeomMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictGeomMapper.xml index 8a0efdf..c0834bc 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictGeomMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictGeomMapper.xml @@ -1,57 +1,57 @@ - - - - - - - delete from dict_geom where geom_sn=#{voyage_name}; - INSERT INTO dict_geom ( geom_type, geom_sn, geom_value, create_time ) - SELECT - 'voyage', - voyage_name, - concat ( 'ST_GeomFromText(''LINESTRING(',string_agg ( concat ( nav_lon, '', nav_lat ), ',' ), ')''' ), - now( ) - FROM - voyage_navigation v, - voyage_reg r - WHERE - v.voyage_id = r.tsy_id - where - r.voyage_name=#{voyage_name} - GROUP BY - v.voyage_id, - voyage_name - ORDER BY - v.voyage_id; - - - - - delete from dict_geom where geom_sn=#{diving_sn}; - INSERT INTO dict_geom ( geom_type, geom_sn, geom_value, create_time ) - SELECT - 'diving', - diving_sn, - concat ( 'ST_GeomFromText(''LINESTRING(', string_agg( concat ( track_lon, '', track_lat ), ',' ), ')''' ), - now( ) - FROM - sample_dataset_track v, - sample_dataset r - WHERE - v.dataset_id = r.tsy_id - where r.diving_sn=#{diving_sn} - GROUP BY - r.diving_sn - ORDER BY - r.diving_sn; - - - - - - - + + + + + + + delete from dict_geom where geom_sn=#{voyage_name}; + INSERT INTO dict_geom ( geom_type, geom_sn, geom_value, create_time ) + SELECT + 'voyage', + voyage_name, + concat ( 'ST_GeomFromText(''LINESTRING(',string_agg ( concat ( nav_lon, '', nav_lat ), ',' ), ')''' ), + now( ) + FROM + voyage_navigation v, + voyage_reg r + WHERE + v.voyage_id = r.tsy_id + where + r.voyage_name=#{voyage_name} + GROUP BY + v.voyage_id, + voyage_name + ORDER BY + v.voyage_id; + + + + + delete from dict_geom where geom_sn=#{diving_sn}; + INSERT INTO dict_geom ( geom_type, geom_sn, geom_value, create_time ) + SELECT + 'diving', + diving_sn, + concat ( 'ST_GeomFromText(''LINESTRING(', string_agg( concat ( track_lon, '', track_lat ), ',' ), ')''' ), + now( ) + FROM + sample_dataset_track v, + sample_dataset r + WHERE + v.dataset_id = r.tsy_id + where r.diving_sn=#{diving_sn} + GROUP BY + r.diving_sn + ORDER BY + r.diving_sn; + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictPlatformMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictPlatformMapper.java index 7e4fe96..15bcef1 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictPlatformMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictPlatformMapper.java @@ -1,32 +1,32 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.dict; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.constant.SqlProviderConstant; -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.cas.idsse.dsds.control.search.SearchParam; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictPlatform; - -@HmeMapper -public interface IDictPlatformMapper extends IHmeMapper{ - public Pageable platformWithPage( - @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, - @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, - @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, - @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type - ); - - public Pageable searchWithPage( - @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, - @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, - @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, - @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, - @Param("param") SearchParam param - ); -} +package cn.tsy.data.cas.idsse.dsds.mapper.dict; + +import org.apache.ibatis.annotations.Param; + +import cn.hme.framework.jdbc.constant.SqlProviderConstant; +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.cas.idsse.dsds.control.search.SearchParam; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictPlatform; + +@HmeMapper +public interface IDictPlatformMapper extends IHmeMapper{ + public Pageable platformWithPage( + @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, + @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, + @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, + @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type + ); + + public Pageable searchWithPage( + @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, + @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, + @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, + @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, + @Param("param") SearchParam param + ); +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictPlatformMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictPlatformMapper.xml index a0f3aa8..86b28bd 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictPlatformMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictPlatformMapper.xml @@ -1,59 +1,59 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictReportMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictReportMapper.java index 631611b..1201ade 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictReportMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictReportMapper.java @@ -1,10 +1,10 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.dict; - -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictReport; - -@HmeMapper -public interface IDictReportMapper extends IHmeMapper{ - -} +package cn.tsy.data.cas.idsse.dsds.mapper.dict; + +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictReport; + +@HmeMapper +public interface IDictReportMapper extends IHmeMapper{ + +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitSailMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitSailMapper.java index 7bde39a..075327f 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitSailMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitSailMapper.java @@ -1,21 +1,21 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.dict; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.constant.SqlProviderConstant; -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictUnitSail; - -@HmeMapper -public interface IDictUnitSailMapper extends IHmeMapper{ - public Pageable sailWithPage( - @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, - @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, - @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, - @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type - ); -} +package cn.tsy.data.cas.idsse.dsds.mapper.dict; + +import org.apache.ibatis.annotations.Param; + +import cn.hme.framework.jdbc.constant.SqlProviderConstant; +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictUnitSail; + +@HmeMapper +public interface IDictUnitSailMapper extends IHmeMapper{ + public Pageable sailWithPage( + @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, + @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, + @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, + @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type + ); +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitSailMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitSailMapper.xml index c6551b5..d84a6f1 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitSailMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitSailMapper.xml @@ -1,23 +1,23 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitShareMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitShareMapper.java index 20ca864..161d209 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitShareMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitShareMapper.java @@ -1,22 +1,22 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.dict; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.constant.SqlProviderConstant; -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.dict.DictUnitShare; - -@HmeMapper -public interface IDictUnitShareMapper extends IHmeMapper{ - public Pageable shareWithPage( - @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, - @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, - @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, - @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type - ); -} - +package cn.tsy.data.cas.idsse.dsds.mapper.dict; + +import org.apache.ibatis.annotations.Param; + +import cn.hme.framework.jdbc.constant.SqlProviderConstant; +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.dict.DictUnitShare; + +@HmeMapper +public interface IDictUnitShareMapper extends IHmeMapper{ + public Pageable shareWithPage( + @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, + @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, + @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, + @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type + ); +} + diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitShareMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitShareMapper.xml index a454f65..61d49bd 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitShareMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/dict/IDictUnitShareMapper.xml @@ -1,23 +1,23 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetMapper.java index 29d4be0..8e75487 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetMapper.java @@ -1,21 +1,21 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.sample; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.constant.SqlProviderConstant; -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; - -@HmeMapper -public interface ISampleDatasetMapper extends IHmeMapper{ - public Pageable datasetWithPage( - @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, - @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, - @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, - @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type - ); -} +package cn.tsy.data.cas.idsse.dsds.mapper.sample; + +import org.apache.ibatis.annotations.Param; + +import cn.hme.framework.jdbc.constant.SqlProviderConstant; +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDataset; + +@HmeMapper +public interface ISampleDatasetMapper extends IHmeMapper{ + public Pageable datasetWithPage( + @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, + @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, + @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, + @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type + ); +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetMapper.xml index 6420cca..b13d43f 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetMapper.xml @@ -1,28 +1,28 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetTrackMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetTrackMapper.java index ac547a2..6f492d3 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetTrackMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetTrackMapper.java @@ -1,17 +1,17 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.sample; - -import java.util.List; -import java.util.Map; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDatasetTrack; - -@HmeMapper -public interface ISampleDatasetTrackMapper extends IHmeMapper{ - public Map totalTrack(@Param("dataset_id") int dataset_id); - - public List> listTrack(@Param("dataset_id") int dataset_id,@Param("ticket_minutes") int ticket_minutes); -} +package cn.tsy.data.cas.idsse.dsds.mapper.sample; + +import java.util.List; +import java.util.Map; + +import org.apache.ibatis.annotations.Param; + +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleDatasetTrack; + +@HmeMapper +public interface ISampleDatasetTrackMapper extends IHmeMapper{ + public Map totalTrack(@Param("dataset_id") int dataset_id); + + public List> listTrack(@Param("dataset_id") int dataset_id,@Param("ticket_minutes") int ticket_minutes); +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetTrackMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetTrackMapper.xml index b49f193..c73a8c3 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetTrackMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleDatasetTrackMapper.xml @@ -1,42 +1,42 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineMapper.java index ee0acff..b5861a8 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineMapper.java @@ -1,10 +1,10 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.sample; - -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleLine; - -@HmeMapper -public interface ISampleLineMapper extends IHmeMapper{ - -} +package cn.tsy.data.cas.idsse.dsds.mapper.sample; + +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleLine; + +@HmeMapper +public interface ISampleLineMapper extends IHmeMapper{ + +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineTrackMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineTrackMapper.java index 416bcae..de5c407 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineTrackMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineTrackMapper.java @@ -1,10 +1,10 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.sample; - -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleLineTrack; - -@HmeMapper -public interface ISampleLineTrackMapper extends IHmeMapper{ - -} +package cn.tsy.data.cas.idsse.dsds.mapper.sample; + +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleLineTrack; + +@HmeMapper +public interface ISampleLineTrackMapper extends IHmeMapper{ + +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineTrackMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineTrackMapper.xml index 2fd6817..501abd4 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineTrackMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleLineTrackMapper.xml @@ -1,13 +1,13 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleStationMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleStationMapper.java index 1311d6c..bfceee9 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleStationMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleStationMapper.java @@ -1,10 +1,10 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.sample; - -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleStation; - -@HmeMapper -public interface ISampleStationMapper extends IHmeMapper{ - -} +package cn.tsy.data.cas.idsse.dsds.mapper.sample; + +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleStation; + +@HmeMapper +public interface ISampleStationMapper extends IHmeMapper{ + +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleStationTrackMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleStationTrackMapper.java index 3f7ea42..a927bc7 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleStationTrackMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/sample/ISampleStationTrackMapper.java @@ -1,10 +1,10 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.sample; - -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.sample.SampleStationTrack; - -@HmeMapper -public interface ISampleStationTrackMapper extends IHmeMapper{ - -} +package cn.tsy.data.cas.idsse.dsds.mapper.sample; + +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.sample.SampleStationTrack; + +@HmeMapper +public interface ISampleStationTrackMapper extends IHmeMapper{ + +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageLogMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageLogMapper.java index 78b753e..8544b9a 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageLogMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageLogMapper.java @@ -1,10 +1,10 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.voyage; - -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageLog; - -@HmeMapper -public interface IVoyageLogMapper extends IHmeMapper{ - -} +package cn.tsy.data.cas.idsse.dsds.mapper.voyage; + +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageLog; + +@HmeMapper +public interface IVoyageLogMapper extends IHmeMapper{ + +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageMemberMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageMemberMapper.java index 4119721..7e05a09 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageMemberMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageMemberMapper.java @@ -1,22 +1,22 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.voyage; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.constant.SqlProviderConstant; -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageMember; - -@HmeMapper -public interface IVoyageMemberMapper extends IHmeMapper{ - public Pageable memberWithPage( - @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, - @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, - @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, - @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, - @Param("voyage_id") int voyage_id - ); -} +package cn.tsy.data.cas.idsse.dsds.mapper.voyage; + +import org.apache.ibatis.annotations.Param; + +import cn.hme.framework.jdbc.constant.SqlProviderConstant; +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageMember; + +@HmeMapper +public interface IVoyageMemberMapper extends IHmeMapper{ + public Pageable memberWithPage( + @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, + @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, + @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, + @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, + @Param("voyage_id") int voyage_id + ); +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageMemberMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageMemberMapper.xml index a11e6e0..abc6001 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageMemberMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageMemberMapper.xml @@ -1,21 +1,21 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageNavigationMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageNavigationMapper.java index 2e16d3f..25f5356 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageNavigationMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageNavigationMapper.java @@ -1,30 +1,30 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.voyage; - -import java.util.List; -import java.util.Map; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.constant.SqlProviderConstant; -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageNavigation; - -@HmeMapper -public interface IVoyageNavigationMapper extends IHmeMapper{ - public Pageable navigationWithPage( - @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, - @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, - @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, - @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, - @Param("voyage_id") int voyage_id - ); - - public Map totalNavigation(@Param("voyage_id") int voyage_id); - - - public List> listNavigation(@Param("voyage_id") int voyage_id,@Param("ticket_minutes") int ticket_minutes); -} +package cn.tsy.data.cas.idsse.dsds.mapper.voyage; + +import java.util.List; +import java.util.Map; + +import org.apache.ibatis.annotations.Param; + +import cn.hme.framework.jdbc.constant.SqlProviderConstant; +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageNavigation; + +@HmeMapper +public interface IVoyageNavigationMapper extends IHmeMapper{ + public Pageable navigationWithPage( + @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, + @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, + @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, + @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, + @Param("voyage_id") int voyage_id + ); + + public Map totalNavigation(@Param("voyage_id") int voyage_id); + + + public List> listNavigation(@Param("voyage_id") int voyage_id,@Param("ticket_minutes") int ticket_minutes); +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageNavigationMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageNavigationMapper.xml index bf68e67..cdbe8f7 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageNavigationMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageNavigationMapper.xml @@ -1,26 +1,26 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegMapper.java index 800f6e6..3872e82 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegMapper.java @@ -1,42 +1,42 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.voyage; - -import java.time.LocalDate; -import java.util.List; -import java.util.Map; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.constant.SqlProviderConstant; -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.cas.idsse.dsds.control.search.SearchParam; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; - -@HmeMapper -public interface IVoyageRegMapper extends IHmeMapper{ - public Pageable voyageWithPage( - @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, - @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, - @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, - @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, - @Param("role_id") Integer role_id, - @Param("optr_id") Integer optr_id - ); - - public Pageable searchWithPage( - @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, - @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, - @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, - @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, - @Param("role_id") Integer role_id, - @Param("optr_id") Integer optr_id, - @Param("param") SearchParam param - ); - - public List> totalVoyage(@Param("start_date") LocalDate start_date,@Param("end_date") LocalDate end_date); -} +package cn.tsy.data.cas.idsse.dsds.mapper.voyage; + +import java.time.LocalDate; +import java.util.List; +import java.util.Map; + +import org.apache.ibatis.annotations.Param; + +import cn.hme.framework.jdbc.constant.SqlProviderConstant; +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.cas.idsse.dsds.control.search.SearchParam; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; + +@HmeMapper +public interface IVoyageRegMapper extends IHmeMapper{ + public Pageable voyageWithPage( + @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, + @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, + @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, + @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, + @Param("role_id") Integer role_id, + @Param("optr_id") Integer optr_id + ); + + public Pageable searchWithPage( + @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, + @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, + @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, + @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, + @Param("role_id") Integer role_id, + @Param("optr_id") Integer optr_id, + @Param("param") SearchParam param + ); + + public List> totalVoyage(@Param("start_date") LocalDate start_date,@Param("end_date") LocalDate end_date); +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegMapper.xml index 0c31c02..7787ed1 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegMapper.xml @@ -1,81 +1,81 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegOptrMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegOptrMapper.java index ba08a7d..46336ba 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegOptrMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegOptrMapper.java @@ -1,16 +1,16 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.voyage; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageRegOptr; - -@HmeMapper -public interface IVoyageRegOptrMapper extends IHmeMapper{ - - public List listVoyage(@Param("optr_id") int optr_id); -} +package cn.tsy.data.cas.idsse.dsds.mapper.voyage; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageReg; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageRegOptr; + +@HmeMapper +public interface IVoyageRegOptrMapper extends IHmeMapper{ + + public List listVoyage(@Param("optr_id") int optr_id); +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegOptrMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegOptrMapper.xml index 8892104..d0cae5f 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegOptrMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegOptrMapper.xml @@ -1,12 +1,12 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.java index 88b867b..04c361a 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.java @@ -1,48 +1,48 @@ -package cn.tsy.data.cas.idsse.dsds.mapper.voyage; - -import java.time.LocalDate; -import java.util.List; -import java.util.Map; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageLog; - -@HmeMapper -public interface IVoyageRegReportMapper extends IHmeMapper { - /*************** - * 科考船的汇总统计：目前有探索一号，探索二号、探索三号，海警101船（名字待定） - * - * @param ship_name 船的名称，如果不传，返回所有的 - */ - public List> reportShipTotal(@Param("ship_name") String ship_name, @Param("start") LocalDate start, - @Param("end") LocalDate end,@Param("year") Integer year); - - /*************** - * 统计参航单位 - * - * @param ship_name 船的名称，如果不传，返回所有的 - */ - public List> reportShipUnitWithYear(@Param("ship_name") String ship_name); - - public List> reportShipUnit(@Param("ship_name") String ship_name, @Param("start") LocalDate start, - @Param("end") LocalDate end,@Param("year") Integer year); - - - public List> reportPlatformTotal(@Param("platform_type") String platform_type, - @Param("platform_name") String platfrom_name, @Param("start") LocalDate start, @Param("end") LocalDate end,@Param("year") Integer year); - - - public List> reportPlatformUnit(@Param("platform_type") String platform_type, - @Param("platform_name") String platfrom_name, @Param("start") LocalDate start, @Param("end") LocalDate end,@Param("year") Integer year); - - - public List> reportPlatfromUnitWithYear(@Param("platform_type") String platform_type,@Param("platform_name") String platform_name); - - - public List> reportPlatformDiving(@Param("platform_type") String platform_type, - @Param("platform_name") String platfrom_name, @Param("start") LocalDate start, @Param("end") LocalDate end,@Param("year") Integer year); - -} +package cn.tsy.data.cas.idsse.dsds.mapper.voyage; + +import java.time.LocalDate; +import java.util.List; +import java.util.Map; + +import org.apache.ibatis.annotations.Param; + +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.dsds.model.voyage.VoyageLog; + +@HmeMapper +public interface IVoyageRegReportMapper extends IHmeMapper { + /*************** + * 科考船的汇总统计：目前有探索一号，探索二号、探索三号，海警101船（名字待定） + * + * @param ship_name 船的名称，如果不传，返回所有的 + */ + public List> reportShipTotal(@Param("ship_name") String ship_name, @Param("start") LocalDate start, + @Param("end") LocalDate end,@Param("year") Integer year); + + /*************** + * 统计参航单位 + * + * @param ship_name 船的名称，如果不传，返回所有的 + */ + public List> reportShipUnitWithYear(@Param("ship_name") String ship_name); + + public List> reportShipUnit(@Param("ship_name") String ship_name, @Param("start") LocalDate start, + @Param("end") LocalDate end,@Param("year") Integer year); + + + public List> reportPlatformTotal(@Param("platform_type") String platform_type, + @Param("platform_name") String platfrom_name, @Param("start") LocalDate start, @Param("end") LocalDate end,@Param("year") Integer year); + + + public List> reportPlatformUnit(@Param("platform_type") String platform_type, + @Param("platform_name") String platfrom_name, @Param("start") LocalDate start, @Param("end") LocalDate end,@Param("year") Integer year); + + + public List> reportPlatfromUnitWithYear(@Param("platform_type") String platform_type,@Param("platform_name") String platform_name); + + + public List> reportPlatformDiving(@Param("platform_type") String platform_type, + @Param("platform_name") String platfrom_name, @Param("start") LocalDate start, @Param("end") LocalDate end,@Param("year") Integer year); + +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml index 4e23f76..aae5902 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml @@ -1,257 +1,257 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictData.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictData.java index 90a7b40..2b71aa1 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictData.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictData.java @@ -1,138 +1,138 @@ -package cn.tsy.data.cas.idsse.dsds.model.dict; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDateTime; - -/********************************************** -* 字典-数据样品类型 -* @author: ZhangXiaoQing -* @date: 2025-10-11 16:45:53 -* @version: v3.2025 -* @email: revisit@126.com -* @Company: www.hmesoft.cn -*/ -@HmeTable(name = "DICT_DATA", key={"tsy_id"}) -public class DictData{ - private Integer tsy_id; - //数据样品类型名称 - private String data_name; - //分组 - private String data_group; - //英文名称 - private String data_eng; - //别名 - private String data_alias; - //描述信息 - private String data_remark; - //创建时间 - private LocalDateTime create_time; - //排序信息 - private Integer data_order; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 数据样品类型名称 - */ - public String getData_name() { - return this.data_name; - } - - /**** - * 数据样品类型名称 - */ - public void setData_name(String data_name) { - this.data_name = data_name; - } - - /**** - * 分组 - */ - public String getData_group() { - return this.data_group; - } - - /**** - * 分组 - */ - public void setData_group(String data_group) { - this.data_group = data_group; - } - - /**** - * 英文名称 - */ - public String getData_eng() { - return this.data_eng; - } - - /**** - * 英文名称 - */ - public void setData_eng(String data_eng) { - this.data_eng = data_eng; - } - - /**** - * 别名 - */ - public String getData_alias() { - return this.data_alias; - } - - /**** - * 别名 - */ - public void setData_alias(String data_alias) { - this.data_alias = data_alias; - } - - /**** - * 描述信息 - */ - public String getData_remark() { - return this.data_remark; - } - - /**** - * 描述信息 - */ - public void setData_remark(String data_remark) { - this.data_remark = data_remark; - } - - /**** - * 创建时间 - */ - public LocalDateTime getCreate_time() { - return this.create_time; - } - - /**** - * 创建时间 - */ - public void setCreate_time(LocalDateTime create_time) { - this.create_time = create_time; - } - - /**** - * 排序信息 - */ - public Integer getData_order() { - return this.data_order; - } - - /**** - * 排序信息 - */ - public void setData_order(Integer data_order) { - this.data_order = data_order; - } - +package cn.tsy.data.cas.idsse.dsds.model.dict; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDateTime; + +/********************************************** +* 字典-数据样品类型 +* @author: ZhangXiaoQing +* @date: 2025-10-11 16:45:53 +* @version: v3.2025 +* @email: revisit@126.com +* @Company: www.hmesoft.cn +*/ +@HmeTable(name = "DICT_DATA", key={"tsy_id"}) +public class DictData{ + private Integer tsy_id; + //数据样品类型名称 + private String data_name; + //分组 + private String data_group; + //英文名称 + private String data_eng; + //别名 + private String data_alias; + //描述信息 + private String data_remark; + //创建时间 + private LocalDateTime create_time; + //排序信息 + private Integer data_order; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 数据样品类型名称 + */ + public String getData_name() { + return this.data_name; + } + + /**** + * 数据样品类型名称 + */ + public void setData_name(String data_name) { + this.data_name = data_name; + } + + /**** + * 分组 + */ + public String getData_group() { + return this.data_group; + } + + /**** + * 分组 + */ + public void setData_group(String data_group) { + this.data_group = data_group; + } + + /**** + * 英文名称 + */ + public String getData_eng() { + return this.data_eng; + } + + /**** + * 英文名称 + */ + public void setData_eng(String data_eng) { + this.data_eng = data_eng; + } + + /**** + * 别名 + */ + public String getData_alias() { + return this.data_alias; + } + + /**** + * 别名 + */ + public void setData_alias(String data_alias) { + this.data_alias = data_alias; + } + + /**** + * 描述信息 + */ + public String getData_remark() { + return this.data_remark; + } + + /**** + * 描述信息 + */ + public void setData_remark(String data_remark) { + this.data_remark = data_remark; + } + + /**** + * 创建时间 + */ + public LocalDateTime getCreate_time() { + return this.create_time; + } + + /**** + * 创建时间 + */ + public void setCreate_time(LocalDateTime create_time) { + this.create_time = create_time; + } + + /**** + * 排序信息 + */ + public Integer getData_order() { + return this.data_order; + } + + /**** + * 排序信息 + */ + public void setData_order(Integer data_order) { + this.data_order = data_order; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictEquipment.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictEquipment.java index 204ff69..f3f867e 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictEquipment.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictEquipment.java @@ -1,139 +1,139 @@ -package cn.tsy.data.cas.idsse.dsds.model.dict; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDateTime; - -/********************************************** - * 字典-设备类型 - * - * @author: ZhangXiaoQing - * @date: 2025-10-11 16:46:24 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "DICT_EQUIPMENT", key = { "tsy_id" }) -public class DictEquipment { - private Integer tsy_id; - // 设备类型名称 - private String equipment_name; - // 设备分组 - private String equipment_group; - // 英文名称 - private String equipment_eng; - // 别名，简称 - private String equipment_alias; - // 备注信息 - private String equipment_remark; - // 创建时间 - private LocalDateTime create_time; - // 排序信息 - private Integer equipment_order; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 设备类型名称 - */ - public String getEquipment_name() { - return this.equipment_name; - } - - /**** - * 设备类型名称 - */ - public void setEquipment_name(String equipment_name) { - this.equipment_name = equipment_name; - } - - /**** - * 设备分组 - */ - public String getEquipment_group() { - return this.equipment_group; - } - - /**** - * 设备分组 - */ - public void setEquipment_group(String equipment_group) { - this.equipment_group = equipment_group; - } - - /**** - * 英文名称 - */ - public String getEquipment_eng() { - return this.equipment_eng; - } - - /**** - * 英文名称 - */ - public void setEquipment_eng(String equipment_eng) { - this.equipment_eng = equipment_eng; - } - - /**** - * 别名，简称 - */ - public String getEquipment_alias() { - return this.equipment_alias; - } - - /**** - * 别名，简称 - */ - public void setEquipment_alias(String equipment_alias) { - this.equipment_alias = equipment_alias; - } - - /**** - * 备注信息 - */ - public String getEquipment_remark() { - return this.equipment_remark; - } - - /**** - * 备注信息 - */ - public void setEquipment_remark(String equipment_remark) { - this.equipment_remark = equipment_remark; - } - - /**** - * 创建时间 - */ - public LocalDateTime getCreate_time() { - return this.create_time; - } - - /**** - * 创建时间 - */ - public void setCreate_time(LocalDateTime create_time) { - this.create_time = create_time; - } - - /**** - * 排序信息 - */ - public Integer getEquipment_order() { - return this.equipment_order; - } - - /**** - * 排序信息 - */ - public void setEquipment_order(Integer equipment_order) { - this.equipment_order = equipment_order; - } - +package cn.tsy.data.cas.idsse.dsds.model.dict; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDateTime; + +/********************************************** + * 字典-设备类型 + * + * @author: ZhangXiaoQing + * @date: 2025-10-11 16:46:24 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "DICT_EQUIPMENT", key = { "tsy_id" }) +public class DictEquipment { + private Integer tsy_id; + // 设备类型名称 + private String equipment_name; + // 设备分组 + private String equipment_group; + // 英文名称 + private String equipment_eng; + // 别名，简称 + private String equipment_alias; + // 备注信息 + private String equipment_remark; + // 创建时间 + private LocalDateTime create_time; + // 排序信息 + private Integer equipment_order; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 设备类型名称 + */ + public String getEquipment_name() { + return this.equipment_name; + } + + /**** + * 设备类型名称 + */ + public void setEquipment_name(String equipment_name) { + this.equipment_name = equipment_name; + } + + /**** + * 设备分组 + */ + public String getEquipment_group() { + return this.equipment_group; + } + + /**** + * 设备分组 + */ + public void setEquipment_group(String equipment_group) { + this.equipment_group = equipment_group; + } + + /**** + * 英文名称 + */ + public String getEquipment_eng() { + return this.equipment_eng; + } + + /**** + * 英文名称 + */ + public void setEquipment_eng(String equipment_eng) { + this.equipment_eng = equipment_eng; + } + + /**** + * 别名，简称 + */ + public String getEquipment_alias() { + return this.equipment_alias; + } + + /**** + * 别名，简称 + */ + public void setEquipment_alias(String equipment_alias) { + this.equipment_alias = equipment_alias; + } + + /**** + * 备注信息 + */ + public String getEquipment_remark() { + return this.equipment_remark; + } + + /**** + * 备注信息 + */ + public void setEquipment_remark(String equipment_remark) { + this.equipment_remark = equipment_remark; + } + + /**** + * 创建时间 + */ + public LocalDateTime getCreate_time() { + return this.create_time; + } + + /**** + * 创建时间 + */ + public void setCreate_time(LocalDateTime create_time) { + this.create_time = create_time; + } + + /**** + * 排序信息 + */ + public Integer getEquipment_order() { + return this.equipment_order; + } + + /**** + * 排序信息 + */ + public void setEquipment_order(Integer equipment_order) { + this.equipment_order = equipment_order; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictFunding.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictFunding.java index 753b590..8be6a59 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictFunding.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictFunding.java @@ -1,91 +1,91 @@ -package cn.tsy.data.cas.idsse.dsds.model.dict; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDateTime; - -/********************************************** - * 字典-资助机构 - * - * @author: ZhangXiaoQing - * @date: 2025-10-11 16:46:47 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "DICT_FUNDING", key = { "tsy_id" }) -public class DictFunding { - private Integer tsy_id; - // 平台类型名称 - private String funding_name; - // 平台分组 - private String funding_eng; - // 创建时间 - private LocalDateTime create_time; - // 排序信息 - private Integer funding_order; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 平台类型名称 - */ - public String getFunding_name() { - return this.funding_name; - } - - /**** - * 平台类型名称 - */ - public void setFunding_name(String funding_name) { - this.funding_name = funding_name; - } - - /**** - * 平台分组 - */ - public String getFunding_eng() { - return this.funding_eng; - } - - /**** - * 平台分组 - */ - public void setFunding_eng(String funding_eng) { - this.funding_eng = funding_eng; - } - - /**** - * 创建时间 - */ - public LocalDateTime getCreate_time() { - return this.create_time; - } - - /**** - * 创建时间 - */ - public void setCreate_time(LocalDateTime create_time) { - this.create_time = create_time; - } - - /**** - * 排序信息 - */ - public Integer getFunding_order() { - return this.funding_order; - } - - /**** - * 排序信息 - */ - public void setFunding_order(Integer funding_order) { - this.funding_order = funding_order; - } - +package cn.tsy.data.cas.idsse.dsds.model.dict; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDateTime; + +/********************************************** + * 字典-资助机构 + * + * @author: ZhangXiaoQing + * @date: 2025-10-11 16:46:47 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "DICT_FUNDING", key = { "tsy_id" }) +public class DictFunding { + private Integer tsy_id; + // 平台类型名称 + private String funding_name; + // 平台分组 + private String funding_eng; + // 创建时间 + private LocalDateTime create_time; + // 排序信息 + private Integer funding_order; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 平台类型名称 + */ + public String getFunding_name() { + return this.funding_name; + } + + /**** + * 平台类型名称 + */ + public void setFunding_name(String funding_name) { + this.funding_name = funding_name; + } + + /**** + * 平台分组 + */ + public String getFunding_eng() { + return this.funding_eng; + } + + /**** + * 平台分组 + */ + public void setFunding_eng(String funding_eng) { + this.funding_eng = funding_eng; + } + + /**** + * 创建时间 + */ + public LocalDateTime getCreate_time() { + return this.create_time; + } + + /**** + * 创建时间 + */ + public void setCreate_time(LocalDateTime create_time) { + this.create_time = create_time; + } + + /**** + * 排序信息 + */ + public Integer getFunding_order() { + return this.funding_order; + } + + /**** + * 排序信息 + */ + public void setFunding_order(Integer funding_order) { + this.funding_order = funding_order; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictGeom.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictGeom.java index 0392d04..8f8902c 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictGeom.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictGeom.java @@ -1,123 +1,123 @@ -package cn.tsy.data.cas.idsse.dsds.model.dict; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDateTime; - -/********************************************** - * 图层信息 - * - * @author: ZhangXiaoQing - * @date: 2025-10-26 10:37:23 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "DICT_GEOM", key = { "TSY_ID" }) -public class DictGeom { - private Integer tsy_id; - // 图层类型：voyage：航次；diving：潜次 - private String geom_type; - // 图层名称，geoserver画好了回填 - private String geom_name; - // 图层级别 - private String geom_level; - // 航次号或者潜次号 - private String geom_sn; - // ST_GeomFromText开头的字符串 - private String geom_value; - // 创建日期 - private LocalDateTime create_time; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 图层类型：voyage：航次；diving：潜次 - */ - public String getGeom_type() { - return this.geom_type; - } - - /**** - * 图层类型：voyage：航次；diving：潜次 - */ - public void setGeom_type(String geom_type) { - this.geom_type = geom_type; - } - - /**** - * 图层名称，geoserver画好了回填 - */ - public String getGeom_name() { - return this.geom_name; - } - - /**** - * 图层名称，geoserver画好了回填 - */ - public void setGeom_name(String geom_name) { - this.geom_name = geom_name; - } - - /**** - * 图层级别 - */ - public String getGeom_level() { - return this.geom_level; - } - - /**** - * 图层级别 - */ - public void setGeom_level(String geom_level) { - this.geom_level = geom_level; - } - - /**** - * 航次号或者潜次号 - */ - public String getGeom_sn() { - return this.geom_sn; - } - - /**** - * 航次号或者潜次号 - */ - public void setGeom_sn(String geom_sn) { - this.geom_sn = geom_sn; - } - - /**** - * ST_GeomFromText开头的字符串 - */ - public String getGeom_value() { - return this.geom_value; - } - - /**** - * ST_GeomFromText开头的字符串 - */ - public void setGeom_value(String geom_value) { - this.geom_value = geom_value; - } - - /**** - * 创建日期 - */ - public LocalDateTime getCreate_time() { - return this.create_time; - } - - /**** - * 创建日期 - */ - public void setCreate_time(LocalDateTime create_time) { - this.create_time = create_time; - } - +package cn.tsy.data.cas.idsse.dsds.model.dict; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDateTime; + +/********************************************** + * 图层信息 + * + * @author: ZhangXiaoQing + * @date: 2025-10-26 10:37:23 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "DICT_GEOM", key = { "TSY_ID" }) +public class DictGeom { + private Integer tsy_id; + // 图层类型：voyage：航次；diving：潜次 + private String geom_type; + // 图层名称，geoserver画好了回填 + private String geom_name; + // 图层级别 + private String geom_level; + // 航次号或者潜次号 + private String geom_sn; + // ST_GeomFromText开头的字符串 + private String geom_value; + // 创建日期 + private LocalDateTime create_time; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 图层类型：voyage：航次；diving：潜次 + */ + public String getGeom_type() { + return this.geom_type; + } + + /**** + * 图层类型：voyage：航次；diving：潜次 + */ + public void setGeom_type(String geom_type) { + this.geom_type = geom_type; + } + + /**** + * 图层名称，geoserver画好了回填 + */ + public String getGeom_name() { + return this.geom_name; + } + + /**** + * 图层名称，geoserver画好了回填 + */ + public void setGeom_name(String geom_name) { + this.geom_name = geom_name; + } + + /**** + * 图层级别 + */ + public String getGeom_level() { + return this.geom_level; + } + + /**** + * 图层级别 + */ + public void setGeom_level(String geom_level) { + this.geom_level = geom_level; + } + + /**** + * 航次号或者潜次号 + */ + public String getGeom_sn() { + return this.geom_sn; + } + + /**** + * 航次号或者潜次号 + */ + public void setGeom_sn(String geom_sn) { + this.geom_sn = geom_sn; + } + + /**** + * ST_GeomFromText开头的字符串 + */ + public String getGeom_value() { + return this.geom_value; + } + + /**** + * ST_GeomFromText开头的字符串 + */ + public void setGeom_value(String geom_value) { + this.geom_value = geom_value; + } + + /**** + * 创建日期 + */ + public LocalDateTime getCreate_time() { + return this.create_time; + } + + /**** + * 创建日期 + */ + public void setCreate_time(LocalDateTime create_time) { + this.create_time = create_time; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictPlatform.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictPlatform.java index 1c3c240..09110fe 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictPlatform.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictPlatform.java @@ -1,139 +1,139 @@ -package cn.tsy.data.cas.idsse.dsds.model.dict; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDateTime; - -/********************************************** - * 字典-平台类型 - * - * @author: ZhangXiaoQing - * @date: 2025-10-11 16:47:06 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "DICT_PLATFORM", key = { "tsy_id" }) -public class DictPlatform { - private Integer tsy_id; - // 平台类型名称 - private String platform_name; - // 平台分组 - private String platform_group; - // 英文名称 - private String platform_eng; - // 别名 - private String platform_alias; - // 备注信息 - private String platform_remark; - // 创建时间 - private LocalDateTime create_time; - // 排序信息 - private Integer platform_order; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 平台类型名称 - */ - public String getPlatform_name() { - return this.platform_name; - } - - /**** - * 平台类型名称 - */ - public void setPlatform_name(String platform_name) { - this.platform_name = platform_name; - } - - /**** - * 平台分组 - */ - public String getPlatform_group() { - return this.platform_group; - } - - /**** - * 平台分组 - */ - public void setPlatform_group(String platform_group) { - this.platform_group = platform_group; - } - - /**** - * 英文名称 - */ - public String getPlatform_eng() { - return this.platform_eng; - } - - /**** - * 英文名称 - */ - public void setPlatform_eng(String platform_eng) { - this.platform_eng = platform_eng; - } - - /**** - * 别名 - */ - public String getPlatform_alias() { - return this.platform_alias; - } - - /**** - * 别名 - */ - public void setPlatform_alias(String platform_alias) { - this.platform_alias = platform_alias; - } - - /**** - * 备注信息 - */ - public String getPlatform_remark() { - return this.platform_remark; - } - - /**** - * 备注信息 - */ - public void setPlatform_remark(String platform_remark) { - this.platform_remark = platform_remark; - } - - /**** - * 创建时间 - */ - public LocalDateTime getCreate_time() { - return this.create_time; - } - - /**** - * 创建时间 - */ - public void setCreate_time(LocalDateTime create_time) { - this.create_time = create_time; - } - - /**** - * 排序信息 - */ - public Integer getPlatform_order() { - return this.platform_order; - } - - /**** - * 排序信息 - */ - public void setPlatform_order(Integer platform_order) { - this.platform_order = platform_order; - } - +package cn.tsy.data.cas.idsse.dsds.model.dict; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDateTime; + +/********************************************** + * 字典-平台类型 + * + * @author: ZhangXiaoQing + * @date: 2025-10-11 16:47:06 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "DICT_PLATFORM", key = { "tsy_id" }) +public class DictPlatform { + private Integer tsy_id; + // 平台类型名称 + private String platform_name; + // 平台分组 + private String platform_group; + // 英文名称 + private String platform_eng; + // 别名 + private String platform_alias; + // 备注信息 + private String platform_remark; + // 创建时间 + private LocalDateTime create_time; + // 排序信息 + private Integer platform_order; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 平台类型名称 + */ + public String getPlatform_name() { + return this.platform_name; + } + + /**** + * 平台类型名称 + */ + public void setPlatform_name(String platform_name) { + this.platform_name = platform_name; + } + + /**** + * 平台分组 + */ + public String getPlatform_group() { + return this.platform_group; + } + + /**** + * 平台分组 + */ + public void setPlatform_group(String platform_group) { + this.platform_group = platform_group; + } + + /**** + * 英文名称 + */ + public String getPlatform_eng() { + return this.platform_eng; + } + + /**** + * 英文名称 + */ + public void setPlatform_eng(String platform_eng) { + this.platform_eng = platform_eng; + } + + /**** + * 别名 + */ + public String getPlatform_alias() { + return this.platform_alias; + } + + /**** + * 别名 + */ + public void setPlatform_alias(String platform_alias) { + this.platform_alias = platform_alias; + } + + /**** + * 备注信息 + */ + public String getPlatform_remark() { + return this.platform_remark; + } + + /**** + * 备注信息 + */ + public void setPlatform_remark(String platform_remark) { + this.platform_remark = platform_remark; + } + + /**** + * 创建时间 + */ + public LocalDateTime getCreate_time() { + return this.create_time; + } + + /**** + * 创建时间 + */ + public void setCreate_time(LocalDateTime create_time) { + this.create_time = create_time; + } + + /**** + * 排序信息 + */ + public Integer getPlatform_order() { + return this.platform_order; + } + + /**** + * 排序信息 + */ + public void setPlatform_order(Integer platform_order) { + this.platform_order = platform_order; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictReport.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictReport.java index 3f39b9a..0906b46 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictReport.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictReport.java @@ -1,90 +1,90 @@ -package cn.tsy.data.cas.idsse.dsds.model.dict; - -import cn.hme.framework.jdbc.core.HmeTable; - -/********************************************** -* 统计 -* @author: ZhangXiaoQing -* @date: 2025-10-22 22:29:28 -* @version: v3.2025 -* @email: revisit@126.com -* @Company: www.hmesoft.cn -*/ -@HmeTable(name = "DICT_REPORT", key={"TSY_ID"}) -public class DictReport{ - private Integer tsy_id; - //报表类型 - private String report_type; - //报名名称 - private String report_name; - //状态，是否启用 - private String report_status; - //顺序 - private String report_order; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 报表类型 - */ - public String getReport_type() { - return this.report_type; - } - - /**** - * 报表类型 - */ - public void setReport_type(String report_type) { - this.report_type = report_type; - } - - /**** - * 报名名称 - */ - public String getReport_name() { - return this.report_name; - } - - /**** - * 报名名称 - */ - public void setReport_name(String report_name) { - this.report_name = report_name; - } - - /**** - * 状态，是否启用 - */ - public String getReport_status() { - return this.report_status; - } - - /**** - * 状态，是否启用 - */ - public void setReport_status(String report_status) { - this.report_status = report_status; - } - - /**** - * 顺序 - */ - public String getReport_order() { - return this.report_order; - } - - /**** - * 顺序 - */ - public void setReport_order(String report_order) { - this.report_order = report_order; - } - - +package cn.tsy.data.cas.idsse.dsds.model.dict; + +import cn.hme.framework.jdbc.core.HmeTable; + +/********************************************** +* 统计 +* @author: ZhangXiaoQing +* @date: 2025-10-22 22:29:28 +* @version: v3.2025 +* @email: revisit@126.com +* @Company: www.hmesoft.cn +*/ +@HmeTable(name = "DICT_REPORT", key={"TSY_ID"}) +public class DictReport{ + private Integer tsy_id; + //报表类型 + private String report_type; + //报名名称 + private String report_name; + //状态，是否启用 + private String report_status; + //顺序 + private String report_order; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 报表类型 + */ + public String getReport_type() { + return this.report_type; + } + + /**** + * 报表类型 + */ + public void setReport_type(String report_type) { + this.report_type = report_type; + } + + /**** + * 报名名称 + */ + public String getReport_name() { + return this.report_name; + } + + /**** + * 报名名称 + */ + public void setReport_name(String report_name) { + this.report_name = report_name; + } + + /**** + * 状态，是否启用 + */ + public String getReport_status() { + return this.report_status; + } + + /**** + * 状态，是否启用 + */ + public void setReport_status(String report_status) { + this.report_status = report_status; + } + + /**** + * 顺序 + */ + public String getReport_order() { + return this.report_order; + } + + /**** + * 顺序 + */ + public void setReport_order(String report_order) { + this.report_order = report_order; + } + + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictUnitSail.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictUnitSail.java index 5b8d669..2677faf 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictUnitSail.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictUnitSail.java @@ -1,203 +1,203 @@ -package cn.tsy.data.cas.idsse.dsds.model.dict; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDateTime; - -/********************************************** - * 字典-参航单位 - * - * @author: ZhangXiaoQing - * @date: 2025-10-11 16:47:25 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "DICT_UNIT_SAIL", key = { "tsy_id" }) -public class DictUnitSail { - private Integer tsy_id; - // 参航单位名称 - private String unit_name; - // 单位负责人 - private String link_man; - // 联系电话 - private String link_tel; - // 传真号码 - private String link_fax; - // 电子邮件 - private String link_email; - // 经度信息 - private String unit_lon; - // 纬度信息 - private String unit_lat; - // 单位地址 - private String unit_addr; - // 单位类型 - private String unit_type; - // 备注信息 - private String unit_remark; - // 创建时间 - private LocalDateTime create_time; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 参航单位名称 - */ - public String getUnit_name() { - return this.unit_name; - } - - /**** - * 参航单位名称 - */ - public void setUnit_name(String unit_name) { - this.unit_name = unit_name; - } - - /**** - * 单位负责人 - */ - public String getLink_man() { - return this.link_man; - } - - /**** - * 单位负责人 - */ - public void setLink_man(String link_man) { - this.link_man = link_man; - } - - /**** - * 联系电话 - */ - public String getLink_tel() { - return this.link_tel; - } - - /**** - * 联系电话 - */ - public void setLink_tel(String link_tel) { - this.link_tel = link_tel; - } - - /**** - * 传真号码 - */ - public String getLink_fax() { - return this.link_fax; - } - - /**** - * 传真号码 - */ - public void setLink_fax(String link_fax) { - this.link_fax = link_fax; - } - - /**** - * 电子邮件 - */ - public String getLink_email() { - return this.link_email; - } - - /**** - * 电子邮件 - */ - public void setLink_email(String link_email) { - this.link_email = link_email; - } - - /**** - * 经度信息 - */ - public String getUnit_lon() { - return this.unit_lon; - } - - /**** - * 经度信息 - */ - public void setUnit_lon(String unit_lon) { - this.unit_lon = unit_lon; - } - - /**** - * 纬度信息 - */ - public String getUnit_lat() { - return this.unit_lat; - } - - /**** - * 纬度信息 - */ - public void setUnit_lat(String unit_lat) { - this.unit_lat = unit_lat; - } - - /**** - * 单位地址 - */ - public String getUnit_addr() { - return this.unit_addr; - } - - /**** - * 单位地址 - */ - public void setUnit_addr(String unit_addr) { - this.unit_addr = unit_addr; - } - - /**** - * 单位类型 - */ - public String getUnit_type() { - return this.unit_type; - } - - /**** - * 单位类型 - */ - public void setUnit_type(String unit_type) { - this.unit_type = unit_type; - } - - /**** - * 备注信息 - */ - public String getUnit_remark() { - return this.unit_remark; - } - - /**** - * 备注信息 - */ - public void setUnit_remark(String unit_remark) { - this.unit_remark = unit_remark; - } - - /**** - * 创建时间 - */ - public LocalDateTime getCreate_time() { - return this.create_time; - } - - /**** - * 创建时间 - */ - public void setCreate_time(LocalDateTime create_time) { - this.create_time = create_time; - } - +package cn.tsy.data.cas.idsse.dsds.model.dict; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDateTime; + +/********************************************** + * 字典-参航单位 + * + * @author: ZhangXiaoQing + * @date: 2025-10-11 16:47:25 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "DICT_UNIT_SAIL", key = { "tsy_id" }) +public class DictUnitSail { + private Integer tsy_id; + // 参航单位名称 + private String unit_name; + // 单位负责人 + private String link_man; + // 联系电话 + private String link_tel; + // 传真号码 + private String link_fax; + // 电子邮件 + private String link_email; + // 经度信息 + private String unit_lon; + // 纬度信息 + private String unit_lat; + // 单位地址 + private String unit_addr; + // 单位类型 + private String unit_type; + // 备注信息 + private String unit_remark; + // 创建时间 + private LocalDateTime create_time; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 参航单位名称 + */ + public String getUnit_name() { + return this.unit_name; + } + + /**** + * 参航单位名称 + */ + public void setUnit_name(String unit_name) { + this.unit_name = unit_name; + } + + /**** + * 单位负责人 + */ + public String getLink_man() { + return this.link_man; + } + + /**** + * 单位负责人 + */ + public void setLink_man(String link_man) { + this.link_man = link_man; + } + + /**** + * 联系电话 + */ + public String getLink_tel() { + return this.link_tel; + } + + /**** + * 联系电话 + */ + public void setLink_tel(String link_tel) { + this.link_tel = link_tel; + } + + /**** + * 传真号码 + */ + public String getLink_fax() { + return this.link_fax; + } + + /**** + * 传真号码 + */ + public void setLink_fax(String link_fax) { + this.link_fax = link_fax; + } + + /**** + * 电子邮件 + */ + public String getLink_email() { + return this.link_email; + } + + /**** + * 电子邮件 + */ + public void setLink_email(String link_email) { + this.link_email = link_email; + } + + /**** + * 经度信息 + */ + public String getUnit_lon() { + return this.unit_lon; + } + + /**** + * 经度信息 + */ + public void setUnit_lon(String unit_lon) { + this.unit_lon = unit_lon; + } + + /**** + * 纬度信息 + */ + public String getUnit_lat() { + return this.unit_lat; + } + + /**** + * 纬度信息 + */ + public void setUnit_lat(String unit_lat) { + this.unit_lat = unit_lat; + } + + /**** + * 单位地址 + */ + public String getUnit_addr() { + return this.unit_addr; + } + + /**** + * 单位地址 + */ + public void setUnit_addr(String unit_addr) { + this.unit_addr = unit_addr; + } + + /**** + * 单位类型 + */ + public String getUnit_type() { + return this.unit_type; + } + + /**** + * 单位类型 + */ + public void setUnit_type(String unit_type) { + this.unit_type = unit_type; + } + + /**** + * 备注信息 + */ + public String getUnit_remark() { + return this.unit_remark; + } + + /**** + * 备注信息 + */ + public void setUnit_remark(String unit_remark) { + this.unit_remark = unit_remark; + } + + /**** + * 创建时间 + */ + public LocalDateTime getCreate_time() { + return this.create_time; + } + + /**** + * 创建时间 + */ + public void setCreate_time(LocalDateTime create_time) { + this.create_time = create_time; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictUnitShare.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictUnitShare.java index 0b16a60..07d74e1 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictUnitShare.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/dict/DictUnitShare.java @@ -1,171 +1,171 @@ -package cn.tsy.data.cas.idsse.dsds.model.dict; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDateTime; - -/********************************************** - * 字典-共享单位 - * - * @author: ZhangXiaoQing - * @date: 2025-10-11 16:47:43 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "DICT_UNIT_SHARE", key = { "tsy_id" }) -public class DictUnitShare { - private Integer tsy_id; - // 参航单位名称 - private String unit_name; - // 单位负责人 - private String link_man; - // 联系电话 - private String link_tel; - // 传真号码 - private String link_fax; - // 电子邮件 - private String link_email; - // 单位地址 - private String unit_addr; - // 单位类型 - private String unit_type; - // 备注信息 - private String unit_remark; - // 创建时间 - private LocalDateTime create_time; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 参航单位名称 - */ - public String getUnit_name() { - return this.unit_name; - } - - /**** - * 参航单位名称 - */ - public void setUnit_name(String unit_name) { - this.unit_name = unit_name; - } - - /**** - * 单位负责人 - */ - public String getLink_man() { - return this.link_man; - } - - /**** - * 单位负责人 - */ - public void setLink_man(String link_man) { - this.link_man = link_man; - } - - /**** - * 联系电话 - */ - public String getLink_tel() { - return this.link_tel; - } - - /**** - * 联系电话 - */ - public void setLink_tel(String link_tel) { - this.link_tel = link_tel; - } - - /**** - * 传真号码 - */ - public String getLink_fax() { - return this.link_fax; - } - - /**** - * 传真号码 - */ - public void setLink_fax(String link_fax) { - this.link_fax = link_fax; - } - - /**** - * 电子邮件 - */ - public String getLink_email() { - return this.link_email; - } - - /**** - * 电子邮件 - */ - public void setLink_email(String link_email) { - this.link_email = link_email; - } - - /**** - * 单位地址 - */ - public String getUnit_addr() { - return this.unit_addr; - } - - /**** - * 单位地址 - */ - public void setUnit_addr(String unit_addr) { - this.unit_addr = unit_addr; - } - - /**** - * 单位类型 - */ - public String getUnit_type() { - return this.unit_type; - } - - /**** - * 单位类型 - */ - public void setUnit_type(String unit_type) { - this.unit_type = unit_type; - } - - /**** - * 备注信息 - */ - public String getUnit_remark() { - return this.unit_remark; - } - - /**** - * 备注信息 - */ - public void setUnit_remark(String unit_remark) { - this.unit_remark = unit_remark; - } - - /**** - * 创建时间 - */ - public LocalDateTime getCreate_time() { - return this.create_time; - } - - /**** - * 创建时间 - */ - public void setCreate_time(LocalDateTime create_time) { - this.create_time = create_time; - } - +package cn.tsy.data.cas.idsse.dsds.model.dict; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDateTime; + +/********************************************** + * 字典-共享单位 + * + * @author: ZhangXiaoQing + * @date: 2025-10-11 16:47:43 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "DICT_UNIT_SHARE", key = { "tsy_id" }) +public class DictUnitShare { + private Integer tsy_id; + // 参航单位名称 + private String unit_name; + // 单位负责人 + private String link_man; + // 联系电话 + private String link_tel; + // 传真号码 + private String link_fax; + // 电子邮件 + private String link_email; + // 单位地址 + private String unit_addr; + // 单位类型 + private String unit_type; + // 备注信息 + private String unit_remark; + // 创建时间 + private LocalDateTime create_time; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 参航单位名称 + */ + public String getUnit_name() { + return this.unit_name; + } + + /**** + * 参航单位名称 + */ + public void setUnit_name(String unit_name) { + this.unit_name = unit_name; + } + + /**** + * 单位负责人 + */ + public String getLink_man() { + return this.link_man; + } + + /**** + * 单位负责人 + */ + public void setLink_man(String link_man) { + this.link_man = link_man; + } + + /**** + * 联系电话 + */ + public String getLink_tel() { + return this.link_tel; + } + + /**** + * 联系电话 + */ + public void setLink_tel(String link_tel) { + this.link_tel = link_tel; + } + + /**** + * 传真号码 + */ + public String getLink_fax() { + return this.link_fax; + } + + /**** + * 传真号码 + */ + public void setLink_fax(String link_fax) { + this.link_fax = link_fax; + } + + /**** + * 电子邮件 + */ + public String getLink_email() { + return this.link_email; + } + + /**** + * 电子邮件 + */ + public void setLink_email(String link_email) { + this.link_email = link_email; + } + + /**** + * 单位地址 + */ + public String getUnit_addr() { + return this.unit_addr; + } + + /**** + * 单位地址 + */ + public void setUnit_addr(String unit_addr) { + this.unit_addr = unit_addr; + } + + /**** + * 单位类型 + */ + public String getUnit_type() { + return this.unit_type; + } + + /**** + * 单位类型 + */ + public void setUnit_type(String unit_type) { + this.unit_type = unit_type; + } + + /**** + * 备注信息 + */ + public String getUnit_remark() { + return this.unit_remark; + } + + /**** + * 备注信息 + */ + public void setUnit_remark(String unit_remark) { + this.unit_remark = unit_remark; + } + + /**** + * 创建时间 + */ + public LocalDateTime getCreate_time() { + return this.create_time; + } + + /**** + * 创建时间 + */ + public void setCreate_time(LocalDateTime create_time) { + this.create_time = create_time; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleDataset.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleDataset.java index 9e31c75..e36a1de 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleDataset.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleDataset.java @@ -1,603 +1,603 @@ -package cn.tsy.data.cas.idsse.dsds.model.sample; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDateTime; - -/********************************************** - * 数据样品数据集 - * - * @author: ZhangXiaoQing - * @date: 2025-10-15 09:00:05 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "SAMPLE_DATASET", key = { "tsy_id" }) -public class SampleDataset { - private Integer tsy_id; - // 作业编号：航次号_平台+潜次号_设备类型_数据样品类型 - private String dataset_name; - // 作业类型，站位作业，测线作业 - private String job_type; - // 航次内部编号 - private Integer voyage_id; - // 航次名称（冗余） - private String voyage_name; - // 平台内部编号 - private Integer platform_id; - // 平台类型 - private String platform_type; - // 平台简称 - private String platform_alias; - // 潜次名称 - private String diving_sn; - // 样品类型 - private String data_type; - // 设备内部编号 - private Integer equipment_id; - // 设备简称 - private String equipment_alias; - // 设备类型 - private String equipment_type; - // 数据样品类型编号 - private Integer data_id; - // 设备样品类型检测 - private String data_alias; - // 平台名称 - private String platform_name; - // 备注信息 - private String dataset_remark; - // 创建时间 - private LocalDateTime create_time; - // 左舷 - private String driver_left; - // 右舷 - private String driver_right; - // 主驾 - private String driver_master; - // 左舷单位 - private String driver_unit_left; - // 右舷单位 - private String driver_unit_right; - // 入水时间 - private LocalDateTime water_in_time; - // 出水时间 - private LocalDateTime water_out_time; - // 水中时间 - private Integer water_minutes; - // 坐底时间 - private LocalDateTime bottom_time; - // 抛载时间 - private LocalDateTime throwing_time; - // 回收时间 - private LocalDateTime receive_time; - // 作业时间 - private Integer job_minutes; - // 布放经度 - private String wiring_lon; - // 布放纬度 - private String wiring_lat; - // 布放深度 - private String wiring_deep; - // 设备编号 - private String equipment_sn; - // 设备型号 - private String equipment_model; - // 设备定标时间 - private LocalDateTime equipment_time; - // 潜水器轨迹文件 - private String diving_track_file; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 作业编号：航次号_平台+潜次号_设备类型_数据样品类型 - */ - public String getDataset_name() { - return this.dataset_name; - } - - /**** - * 作业编号：航次号_平台+潜次号_设备类型_数据样品类型 - */ - public void setDataset_name(String dataset_name) { - this.dataset_name = dataset_name; - } - - /**** - * 作业类型，站位作业，测线作业 - */ - public String getJob_type() { - return this.job_type; - } - - /**** - * 作业类型，站位作业，测线作业 - */ - public void setJob_type(String job_type) { - this.job_type = job_type; - } - - /**** - * 航次内部编号 - */ - public Integer getVoyage_id() { - return this.voyage_id; - } - - /**** - * 航次内部编号 - */ - public void setVoyage_id(Integer voyage_id) { - this.voyage_id = voyage_id; - } - - /**** - * 航次名称（冗余） - */ - public String getVoyage_name() { - return this.voyage_name; - } - - /**** - * 航次名称（冗余） - */ - public void setVoyage_name(String voyage_name) { - this.voyage_name = voyage_name; - } - - /**** - * 平台内部编号 - */ - public Integer getPlatform_id() { - return this.platform_id; - } - - /**** - * 平台内部编号 - */ - public void setPlatform_id(Integer platform_id) { - this.platform_id = platform_id; - } - - /**** - * 平台类型 - */ - public String getPlatform_type() { - return this.platform_type; - } - - /**** - * 平台类型 - */ - public void setPlatform_type(String platform_type) { - this.platform_type = platform_type; - } - - /**** - * 平台简称 - */ - public String getPlatform_alias() { - return this.platform_alias; - } - - /**** - * 平台简称 - */ - public void setPlatform_alias(String platform_alias) { - this.platform_alias = platform_alias; - } - - /**** - * 潜次名称 - */ - public String getDiving_sn() { - return this.diving_sn; - } - - /**** - * 潜次名称 - */ - public void setDiving_sn(String diving_sn) { - this.diving_sn = diving_sn; - } - - /**** - * 样品类型 - */ - public String getData_type() { - return this.data_type; - } - - /**** - * 样品类型 - */ - public void setData_type(String data_type) { - this.data_type = data_type; - } - - /**** - * 设备内部编号 - */ - public Integer getEquipment_id() { - return this.equipment_id; - } - - /**** - * 设备内部编号 - */ - public void setEquipment_id(Integer equipment_id) { - this.equipment_id = equipment_id; - } - - /**** - * 设备简称 - */ - public String getEquipment_alias() { - return this.equipment_alias; - } - - /**** - * 设备简称 - */ - public void setEquipment_alias(String equipment_alias) { - this.equipment_alias = equipment_alias; - } - - /**** - * 设备类型 - */ - public String getEquipment_type() { - return this.equipment_type; - } - - /**** - * 设备类型 - */ - public void setEquipment_type(String equipment_type) { - this.equipment_type = equipment_type; - } - - /**** - * 数据样品类型编号 - */ - public Integer getData_id() { - return this.data_id; - } - - /**** - * 数据样品类型编号 - */ - public void setData_id(Integer data_id) { - this.data_id = data_id; - } - - /**** - * 设备样品类型检测 - */ - public String getData_alias() { - return this.data_alias; - } - - /**** - * 设备样品类型检测 - */ - public void setData_alias(String data_alias) { - this.data_alias = data_alias; - } - - /**** - * 平台名称 - */ - public String getPlatform_name() { - return this.platform_name; - } - - /**** - * 平台名称 - */ - public void setPlatform_name(String platform_name) { - this.platform_name = platform_name; - } - - /**** - * 备注信息 - */ - public String getDataset_remark() { - return this.dataset_remark; - } - - /**** - * 备注信息 - */ - public void setDataset_remark(String dataset_remark) { - this.dataset_remark = dataset_remark; - } - - /**** - * 创建时间 - */ - public LocalDateTime getCreate_time() { - return this.create_time; - } - - /**** - * 创建时间 - */ - public void setCreate_time(LocalDateTime create_time) { - this.create_time = create_time; - } - - /**** - * 左舷 - */ - public String getDriver_left() { - return this.driver_left; - } - - /**** - * 左舷 - */ - public void setDriver_left(String driver_left) { - this.driver_left = driver_left; - } - - /**** - * 右舷 - */ - public String getDriver_right() { - return this.driver_right; - } - - /**** - * 右舷 - */ - public void setDriver_right(String driver_right) { - this.driver_right = driver_right; - } - - /**** - * 主驾 - */ - public String getDriver_master() { - return this.driver_master; - } - - /**** - * 主驾 - */ - public void setDriver_master(String driver_master) { - this.driver_master = driver_master; - } - - /**** - * 左舷单位 - */ - public String getDriver_unit_left() { - return this.driver_unit_left; - } - - /**** - * 左舷单位 - */ - public void setDriver_unit_left(String driver_unit_left) { - this.driver_unit_left = driver_unit_left; - } - - /**** - * 右舷单位 - */ - public String getDriver_unit_right() { - return this.driver_unit_right; - } - - /**** - * 右舷单位 - */ - public void setDriver_unit_right(String driver_unit_right) { - this.driver_unit_right = driver_unit_right; - } - - /**** - * 入水时间 - */ - public LocalDateTime getWater_in_time() { - return this.water_in_time; - } - - /**** - * 入水时间 - */ - public void setWater_in_time(LocalDateTime water_in_time) { - this.water_in_time = water_in_time; - } - - /**** - * 出水时间 - */ - public LocalDateTime getWater_out_time() { - return this.water_out_time; - } - - /**** - * 出水时间 - */ - public void setWater_out_time(LocalDateTime water_out_time) { - this.water_out_time = water_out_time; - } - - /**** - * 水中时间 - */ - public Integer getWater_minutes() { - return this.water_minutes; - } - - /**** - * 水中时间 - */ - public void setWater_minutes(Integer water_minutes) { - this.water_minutes = water_minutes; - } - - /**** - * 坐底时间 - */ - public LocalDateTime getBottom_time() { - return this.bottom_time; - } - - /**** - * 坐底时间 - */ - public void setBottom_time(LocalDateTime bottom_time) { - this.bottom_time = bottom_time; - } - - /**** - * 抛载时间 - */ - public LocalDateTime getThrowing_time() { - return this.throwing_time; - } - - /**** - * 抛载时间 - */ - public void setThrowing_time(LocalDateTime throwing_time) { - this.throwing_time = throwing_time; - } - - /**** - * 回收时间 - */ - public LocalDateTime getReceive_time() { - return this.receive_time; - } - - /**** - * 回收时间 - */ - public void setReceive_time(LocalDateTime receive_time) { - this.receive_time = receive_time; - } - - /**** - * 作业时间 - */ - public Integer getJob_minutes() { - return this.job_minutes; - } - - /**** - * 作业时间 - */ - public void setJob_minutes(Integer job_minutes) { - this.job_minutes = job_minutes; - } - - /**** - * 布放经度 - */ - public String getWiring_lon() { - return this.wiring_lon; - } - - /**** - * 布放经度 - */ - public void setWiring_lon(String wiring_lon) { - this.wiring_lon = wiring_lon; - } - - /**** - * 布放纬度 - */ - public String getWiring_lat() { - return this.wiring_lat; - } - - /**** - * 布放纬度 - */ - public void setWiring_lat(String wiring_lat) { - this.wiring_lat = wiring_lat; - } - - /**** - * 布放深度 - */ - public String getWiring_deep() { - return this.wiring_deep; - } - - /**** - * 布放深度 - */ - public void setWiring_deep(String wiring_deep) { - this.wiring_deep = wiring_deep; - } - - /**** - * 设备编号 - */ - public String getEquipment_sn() { - return this.equipment_sn; - } - - /**** - * 设备编号 - */ - public void setEquipment_sn(String equipment_sn) { - this.equipment_sn = equipment_sn; - } - - /**** - * 设备型号 - */ - public String getEquipment_model() { - return this.equipment_model; - } - - /**** - * 设备型号 - */ - public void setEquipment_model(String equipment_model) { - this.equipment_model = equipment_model; - } - - /**** - * 设备定标时间 - */ - public LocalDateTime getEquipment_time() { - return this.equipment_time; - } - - /**** - * 设备定标时间 - */ - public void setEquipment_time(LocalDateTime equipment_time) { - this.equipment_time = equipment_time; - } - - /**** - * 潜水器轨迹文件 - */ - public String getDiving_track_file() { - return this.diving_track_file; - } - - /**** - * 潜水器轨迹文件 - */ - public void setDiving_track_file(String diving_track_file) { - this.diving_track_file = diving_track_file; - } - +package cn.tsy.data.cas.idsse.dsds.model.sample; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDateTime; + +/********************************************** + * 数据样品数据集 + * + * @author: ZhangXiaoQing + * @date: 2025-10-15 09:00:05 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "SAMPLE_DATASET", key = { "tsy_id" }) +public class SampleDataset { + private Integer tsy_id; + // 作业编号：航次号_平台+潜次号_设备类型_数据样品类型 + private String dataset_name; + // 作业类型，站位作业，测线作业 + private String job_type; + // 航次内部编号 + private Integer voyage_id; + // 航次名称（冗余） + private String voyage_name; + // 平台内部编号 + private Integer platform_id; + // 平台类型 + private String platform_type; + // 平台简称 + private String platform_alias; + // 潜次名称 + private String diving_sn; + // 样品类型 + private String data_type; + // 设备内部编号 + private Integer equipment_id; + // 设备简称 + private String equipment_alias; + // 设备类型 + private String equipment_type; + // 数据样品类型编号 + private Integer data_id; + // 设备样品类型检测 + private String data_alias; + // 平台名称 + private String platform_name; + // 备注信息 + private String dataset_remark; + // 创建时间 + private LocalDateTime create_time; + // 左舷 + private String driver_left; + // 右舷 + private String driver_right; + // 主驾 + private String driver_master; + // 左舷单位 + private String driver_unit_left; + // 右舷单位 + private String driver_unit_right; + // 入水时间 + private LocalDateTime water_in_time; + // 出水时间 + private LocalDateTime water_out_time; + // 水中时间 + private Integer water_minutes; + // 坐底时间 + private LocalDateTime bottom_time; + // 抛载时间 + private LocalDateTime throwing_time; + // 回收时间 + private LocalDateTime receive_time; + // 作业时间 + private Integer job_minutes; + // 布放经度 + private String wiring_lon; + // 布放纬度 + private String wiring_lat; + // 布放深度 + private String wiring_deep; + // 设备编号 + private String equipment_sn; + // 设备型号 + private String equipment_model; + // 设备定标时间 + private LocalDateTime equipment_time; + // 潜水器轨迹文件 + private String diving_track_file; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 作业编号：航次号_平台+潜次号_设备类型_数据样品类型 + */ + public String getDataset_name() { + return this.dataset_name; + } + + /**** + * 作业编号：航次号_平台+潜次号_设备类型_数据样品类型 + */ + public void setDataset_name(String dataset_name) { + this.dataset_name = dataset_name; + } + + /**** + * 作业类型，站位作业，测线作业 + */ + public String getJob_type() { + return this.job_type; + } + + /**** + * 作业类型，站位作业，测线作业 + */ + public void setJob_type(String job_type) { + this.job_type = job_type; + } + + /**** + * 航次内部编号 + */ + public Integer getVoyage_id() { + return this.voyage_id; + } + + /**** + * 航次内部编号 + */ + public void setVoyage_id(Integer voyage_id) { + this.voyage_id = voyage_id; + } + + /**** + * 航次名称（冗余） + */ + public String getVoyage_name() { + return this.voyage_name; + } + + /**** + * 航次名称（冗余） + */ + public void setVoyage_name(String voyage_name) { + this.voyage_name = voyage_name; + } + + /**** + * 平台内部编号 + */ + public Integer getPlatform_id() { + return this.platform_id; + } + + /**** + * 平台内部编号 + */ + public void setPlatform_id(Integer platform_id) { + this.platform_id = platform_id; + } + + /**** + * 平台类型 + */ + public String getPlatform_type() { + return this.platform_type; + } + + /**** + * 平台类型 + */ + public void setPlatform_type(String platform_type) { + this.platform_type = platform_type; + } + + /**** + * 平台简称 + */ + public String getPlatform_alias() { + return this.platform_alias; + } + + /**** + * 平台简称 + */ + public void setPlatform_alias(String platform_alias) { + this.platform_alias = platform_alias; + } + + /**** + * 潜次名称 + */ + public String getDiving_sn() { + return this.diving_sn; + } + + /**** + * 潜次名称 + */ + public void setDiving_sn(String diving_sn) { + this.diving_sn = diving_sn; + } + + /**** + * 样品类型 + */ + public String getData_type() { + return this.data_type; + } + + /**** + * 样品类型 + */ + public void setData_type(String data_type) { + this.data_type = data_type; + } + + /**** + * 设备内部编号 + */ + public Integer getEquipment_id() { + return this.equipment_id; + } + + /**** + * 设备内部编号 + */ + public void setEquipment_id(Integer equipment_id) { + this.equipment_id = equipment_id; + } + + /**** + * 设备简称 + */ + public String getEquipment_alias() { + return this.equipment_alias; + } + + /**** + * 设备简称 + */ + public void setEquipment_alias(String equipment_alias) { + this.equipment_alias = equipment_alias; + } + + /**** + * 设备类型 + */ + public String getEquipment_type() { + return this.equipment_type; + } + + /**** + * 设备类型 + */ + public void setEquipment_type(String equipment_type) { + this.equipment_type = equipment_type; + } + + /**** + * 数据样品类型编号 + */ + public Integer getData_id() { + return this.data_id; + } + + /**** + * 数据样品类型编号 + */ + public void setData_id(Integer data_id) { + this.data_id = data_id; + } + + /**** + * 设备样品类型检测 + */ + public String getData_alias() { + return this.data_alias; + } + + /**** + * 设备样品类型检测 + */ + public void setData_alias(String data_alias) { + this.data_alias = data_alias; + } + + /**** + * 平台名称 + */ + public String getPlatform_name() { + return this.platform_name; + } + + /**** + * 平台名称 + */ + public void setPlatform_name(String platform_name) { + this.platform_name = platform_name; + } + + /**** + * 备注信息 + */ + public String getDataset_remark() { + return this.dataset_remark; + } + + /**** + * 备注信息 + */ + public void setDataset_remark(String dataset_remark) { + this.dataset_remark = dataset_remark; + } + + /**** + * 创建时间 + */ + public LocalDateTime getCreate_time() { + return this.create_time; + } + + /**** + * 创建时间 + */ + public void setCreate_time(LocalDateTime create_time) { + this.create_time = create_time; + } + + /**** + * 左舷 + */ + public String getDriver_left() { + return this.driver_left; + } + + /**** + * 左舷 + */ + public void setDriver_left(String driver_left) { + this.driver_left = driver_left; + } + + /**** + * 右舷 + */ + public String getDriver_right() { + return this.driver_right; + } + + /**** + * 右舷 + */ + public void setDriver_right(String driver_right) { + this.driver_right = driver_right; + } + + /**** + * 主驾 + */ + public String getDriver_master() { + return this.driver_master; + } + + /**** + * 主驾 + */ + public void setDriver_master(String driver_master) { + this.driver_master = driver_master; + } + + /**** + * 左舷单位 + */ + public String getDriver_unit_left() { + return this.driver_unit_left; + } + + /**** + * 左舷单位 + */ + public void setDriver_unit_left(String driver_unit_left) { + this.driver_unit_left = driver_unit_left; + } + + /**** + * 右舷单位 + */ + public String getDriver_unit_right() { + return this.driver_unit_right; + } + + /**** + * 右舷单位 + */ + public void setDriver_unit_right(String driver_unit_right) { + this.driver_unit_right = driver_unit_right; + } + + /**** + * 入水时间 + */ + public LocalDateTime getWater_in_time() { + return this.water_in_time; + } + + /**** + * 入水时间 + */ + public void setWater_in_time(LocalDateTime water_in_time) { + this.water_in_time = water_in_time; + } + + /**** + * 出水时间 + */ + public LocalDateTime getWater_out_time() { + return this.water_out_time; + } + + /**** + * 出水时间 + */ + public void setWater_out_time(LocalDateTime water_out_time) { + this.water_out_time = water_out_time; + } + + /**** + * 水中时间 + */ + public Integer getWater_minutes() { + return this.water_minutes; + } + + /**** + * 水中时间 + */ + public void setWater_minutes(Integer water_minutes) { + this.water_minutes = water_minutes; + } + + /**** + * 坐底时间 + */ + public LocalDateTime getBottom_time() { + return this.bottom_time; + } + + /**** + * 坐底时间 + */ + public void setBottom_time(LocalDateTime bottom_time) { + this.bottom_time = bottom_time; + } + + /**** + * 抛载时间 + */ + public LocalDateTime getThrowing_time() { + return this.throwing_time; + } + + /**** + * 抛载时间 + */ + public void setThrowing_time(LocalDateTime throwing_time) { + this.throwing_time = throwing_time; + } + + /**** + * 回收时间 + */ + public LocalDateTime getReceive_time() { + return this.receive_time; + } + + /**** + * 回收时间 + */ + public void setReceive_time(LocalDateTime receive_time) { + this.receive_time = receive_time; + } + + /**** + * 作业时间 + */ + public Integer getJob_minutes() { + return this.job_minutes; + } + + /**** + * 作业时间 + */ + public void setJob_minutes(Integer job_minutes) { + this.job_minutes = job_minutes; + } + + /**** + * 布放经度 + */ + public String getWiring_lon() { + return this.wiring_lon; + } + + /**** + * 布放经度 + */ + public void setWiring_lon(String wiring_lon) { + this.wiring_lon = wiring_lon; + } + + /**** + * 布放纬度 + */ + public String getWiring_lat() { + return this.wiring_lat; + } + + /**** + * 布放纬度 + */ + public void setWiring_lat(String wiring_lat) { + this.wiring_lat = wiring_lat; + } + + /**** + * 布放深度 + */ + public String getWiring_deep() { + return this.wiring_deep; + } + + /**** + * 布放深度 + */ + public void setWiring_deep(String wiring_deep) { + this.wiring_deep = wiring_deep; + } + + /**** + * 设备编号 + */ + public String getEquipment_sn() { + return this.equipment_sn; + } + + /**** + * 设备编号 + */ + public void setEquipment_sn(String equipment_sn) { + this.equipment_sn = equipment_sn; + } + + /**** + * 设备型号 + */ + public String getEquipment_model() { + return this.equipment_model; + } + + /**** + * 设备型号 + */ + public void setEquipment_model(String equipment_model) { + this.equipment_model = equipment_model; + } + + /**** + * 设备定标时间 + */ + public LocalDateTime getEquipment_time() { + return this.equipment_time; + } + + /**** + * 设备定标时间 + */ + public void setEquipment_time(LocalDateTime equipment_time) { + this.equipment_time = equipment_time; + } + + /**** + * 潜水器轨迹文件 + */ + public String getDiving_track_file() { + return this.diving_track_file; + } + + /**** + * 潜水器轨迹文件 + */ + public void setDiving_track_file(String diving_track_file) { + this.diving_track_file = diving_track_file; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleDatasetTrack.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleDatasetTrack.java index 761f55e..3d01a78 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleDatasetTrack.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleDatasetTrack.java @@ -1,91 +1,91 @@ -package cn.tsy.data.cas.idsse.dsds.model.sample; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDateTime; - -/********************************************** - * 潜水器轨迹文件 - * - * @author: ZhangXiaoQing - * @date: 2025-10-11 16:49:02 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "SAMPLE_DATASET_TRACK", key = { "tsy_id" }) -public class SampleDatasetTrack { - private Integer tsy_id; - // 数据集编号 - private Integer dataset_id; - // 经度 - private String track_lon; - // 纬度 - private String track_lat; - // 时间 - private LocalDateTime track_time; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 数据集编号 - */ - public Integer getDataset_id() { - return this.dataset_id; - } - - /**** - * 数据集编号 - */ - public void setDataset_id(Integer dataset_id) { - this.dataset_id = dataset_id; - } - - /**** - * 经度 - */ - public String getTrack_lon() { - return this.track_lon; - } - - /**** - * 经度 - */ - public void setTrack_lon(String track_lon) { - this.track_lon = track_lon; - } - - /**** - * 纬度 - */ - public String getTrack_lat() { - return this.track_lat; - } - - /**** - * 纬度 - */ - public void setTrack_lat(String track_lat) { - this.track_lat = track_lat; - } - - /**** - * 时间 - */ - public LocalDateTime getTrack_time() { - return this.track_time; - } - - /**** - * 时间 - */ - public void setTrack_time(LocalDateTime track_time) { - this.track_time = track_time; - } - +package cn.tsy.data.cas.idsse.dsds.model.sample; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDateTime; + +/********************************************** + * 潜水器轨迹文件 + * + * @author: ZhangXiaoQing + * @date: 2025-10-11 16:49:02 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "SAMPLE_DATASET_TRACK", key = { "tsy_id" }) +public class SampleDatasetTrack { + private Integer tsy_id; + // 数据集编号 + private Integer dataset_id; + // 经度 + private String track_lon; + // 纬度 + private String track_lat; + // 时间 + private LocalDateTime track_time; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 数据集编号 + */ + public Integer getDataset_id() { + return this.dataset_id; + } + + /**** + * 数据集编号 + */ + public void setDataset_id(Integer dataset_id) { + this.dataset_id = dataset_id; + } + + /**** + * 经度 + */ + public String getTrack_lon() { + return this.track_lon; + } + + /**** + * 经度 + */ + public void setTrack_lon(String track_lon) { + this.track_lon = track_lon; + } + + /**** + * 纬度 + */ + public String getTrack_lat() { + return this.track_lat; + } + + /**** + * 纬度 + */ + public void setTrack_lat(String track_lat) { + this.track_lat = track_lat; + } + + /**** + * 时间 + */ + public LocalDateTime getTrack_time() { + return this.track_time; + } + + /**** + * 时间 + */ + public void setTrack_time(LocalDateTime track_time) { + this.track_time = track_time; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleLine.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleLine.java index d04f6c2..6d55558 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleLine.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleLine.java @@ -1,396 +1,396 @@ -package cn.tsy.data.cas.idsse.dsds.model.sample; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDateTime; - -/********************************************** - * 数据样品-测线作业 - * - * @author: ZhangXiaoQing - * @date: 2025-10-11 16:49:30 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "SAMPLE_LINE", key = { "tsy_id" }) -public class SampleLine { - private Integer tsy_id; - //数据集编号 - private Integer dataset_id; - //数据集名称 - private String dataset_name; - //数据样品编号 - private String sample_name; - //数据样品在数据集内部编号 - private String sample_seq; - //赞助机构 - private String funding_org; - //公开期限 - private String publish_rule; - //测线号 - private String line_sn; - //测线深度 - private String line_deep; - //开始经度 - private String start_lon; - //开始纬度 - private String start_lat; - //结束经度 - private String end_lon; - //结束纬度 - private String end_lat; - //开始时间 - private LocalDateTime start_time; - //结束时间 - private LocalDateTime end_time; - //上传测线轨迹文件名称 - private String track_file_name; - //数据格式 - private String sample_format; - //原始数据、预处理数据、后处理数据 - private String sample_status; - //应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次 - private String sample_tag_name; - //标签对应的值，用于关联第三方系统 - private String sample_tag_value; - //备注信息 - private String sample_remark; - //创建时间 - private LocalDateTime create_time; - //覆盖宽度 - private Integer conver_width; - //计算出来的覆盖面积 - private Integer conver_area; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 数据集编号 - */ - public Integer getDataset_id() { - return this.dataset_id; - } - - /**** - * 数据集编号 - */ - public void setDataset_id(Integer dataset_id) { - this.dataset_id = dataset_id; - } - - /**** - * 数据集名称 - */ - public String getDataset_name() { - return this.dataset_name; - } - - /**** - * 数据集名称 - */ - public void setDataset_name(String dataset_name) { - this.dataset_name = dataset_name; - } - - /**** - * 数据样品编号 - */ - public String getSample_name() { - return this.sample_name; - } - - /**** - * 数据样品编号 - */ - public void setSample_name(String sample_name) { - this.sample_name = sample_name; - } - - /**** - * 数据样品在数据集内部编号 - */ - public String getSample_seq() { - return this.sample_seq; - } - - /**** - * 数据样品在数据集内部编号 - */ - public void setSample_seq(String sample_seq) { - this.sample_seq = sample_seq; - } - - /**** - * 赞助机构 - */ - public String getFunding_org() { - return this.funding_org; - } - - /**** - * 赞助机构 - */ - public void setFunding_org(String funding_org) { - this.funding_org = funding_org; - } - - /**** - * 公开期限 - */ - public String getPublish_rule() { - return this.publish_rule; - } - - /**** - * 公开期限 - */ - public void setPublish_rule(String publish_rule) { - this.publish_rule = publish_rule; - } - - /**** - * 测线号 - */ - public String getLine_sn() { - return this.line_sn; - } - - /**** - * 测线号 - */ - public void setLine_sn(String line_sn) { - this.line_sn = line_sn; - } - - /**** - * 测线深度 - */ - public String getLine_deep() { - return this.line_deep; - } - - /**** - * 测线深度 - */ - public void setLine_deep(String line_deep) { - this.line_deep = line_deep; - } - - /**** - * 开始经度 - */ - public String getStart_lon() { - return this.start_lon; - } - - /**** - * 开始经度 - */ - public void setStart_lon(String start_lon) { - this.start_lon = start_lon; - } - - /**** - * 开始纬度 - */ - public String getStart_lat() { - return this.start_lat; - } - - /**** - * 开始纬度 - */ - public void setStart_lat(String start_lat) { - this.start_lat = start_lat; - } - - /**** - * 结束经度 - */ - public String getEnd_lon() { - return this.end_lon; - } - - /**** - * 结束经度 - */ - public void setEnd_lon(String end_lon) { - this.end_lon = end_lon; - } - - /**** - * 结束纬度 - */ - public String getEnd_lat() { - return this.end_lat; - } - - /**** - * 结束纬度 - */ - public void setEnd_lat(String end_lat) { - this.end_lat = end_lat; - } - - /**** - * 开始时间 - */ - public LocalDateTime getStart_time() { - return this.start_time; - } - - /**** - * 开始时间 - */ - public void setStart_time(LocalDateTime start_time) { - this.start_time = start_time; - } - - /**** - * 结束时间 - */ - public LocalDateTime getEnd_time() { - return this.end_time; - } - - /**** - * 结束时间 - */ - public void setEnd_time(LocalDateTime end_time) { - this.end_time = end_time; - } - - /**** - * 上传测线轨迹文件名称 - */ - public String getTrack_file_name() { - return this.track_file_name; - } - - /**** - * 上传测线轨迹文件名称 - */ - public void setTrack_file_name(String track_file_name) { - this.track_file_name = track_file_name; - } - - /**** - * 数据格式 - */ - public String getSample_format() { - return this.sample_format; - } - - /**** - * 数据格式 - */ - public void setSample_format(String sample_format) { - this.sample_format = sample_format; - } - - /**** - * 原始数据、预处理数据、后处理数据 - */ - public String getSample_status() { - return this.sample_status; - } - - /**** - * 原始数据、预处理数据、后处理数据 - */ - public void setSample_status(String sample_status) { - this.sample_status = sample_status; - } - - /**** - * 应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次 - */ - public String getSample_tag_name() { - return this.sample_tag_name; - } - - /**** - * 应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次 - */ - public void setSample_tag_name(String sample_tag_name) { - this.sample_tag_name = sample_tag_name; - } - - /**** - * 标签对应的值，用于关联第三方系统 - */ - public String getSample_tag_value() { - return this.sample_tag_value; - } - - /**** - * 标签对应的值，用于关联第三方系统 - */ - public void setSample_tag_value(String sample_tag_value) { - this.sample_tag_value = sample_tag_value; - } - - /**** - * 备注信息 - */ - public String getSample_remark() { - return this.sample_remark; - } - - /**** - * 备注信息 - */ - public void setSample_remark(String sample_remark) { - this.sample_remark = sample_remark; - } - - /**** - * 创建时间 - */ - public LocalDateTime getCreate_time() { - return this.create_time; - } - - /**** - * 创建时间 - */ - public void setCreate_time(LocalDateTime create_time) { - this.create_time = create_time; - } - - /**** - * 覆盖宽度 - */ - public Integer getConver_width() { - return this.conver_width; - } - - /**** - * 覆盖宽度 - */ - public void setConver_width(Integer conver_width) { - this.conver_width = conver_width; - } - - /**** - * 计算出来的覆盖面积 - */ - public Integer getConver_area() { - return this.conver_area; - } - - /**** - * 计算出来的覆盖面积 - */ - public void setConver_area(Integer conver_area) { - this.conver_area = conver_area; - } - - +package cn.tsy.data.cas.idsse.dsds.model.sample; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDateTime; + +/********************************************** + * 数据样品-测线作业 + * + * @author: ZhangXiaoQing + * @date: 2025-10-11 16:49:30 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "SAMPLE_LINE", key = { "tsy_id" }) +public class SampleLine { + private Integer tsy_id; + //数据集编号 + private Integer dataset_id; + //数据集名称 + private String dataset_name; + //数据样品编号 + private String sample_name; + //数据样品在数据集内部编号 + private String sample_seq; + //赞助机构 + private String funding_org; + //公开期限 + private String publish_rule; + //测线号 + private String line_sn; + //测线深度 + private String line_deep; + //开始经度 + private String start_lon; + //开始纬度 + private String start_lat; + //结束经度 + private String end_lon; + //结束纬度 + private String end_lat; + //开始时间 + private LocalDateTime start_time; + //结束时间 + private LocalDateTime end_time; + //上传测线轨迹文件名称 + private String track_file_name; + //数据格式 + private String sample_format; + //原始数据、预处理数据、后处理数据 + private String sample_status; + //应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次 + private String sample_tag_name; + //标签对应的值，用于关联第三方系统 + private String sample_tag_value; + //备注信息 + private String sample_remark; + //创建时间 + private LocalDateTime create_time; + //覆盖宽度 + private Integer conver_width; + //计算出来的覆盖面积 + private Integer conver_area; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 数据集编号 + */ + public Integer getDataset_id() { + return this.dataset_id; + } + + /**** + * 数据集编号 + */ + public void setDataset_id(Integer dataset_id) { + this.dataset_id = dataset_id; + } + + /**** + * 数据集名称 + */ + public String getDataset_name() { + return this.dataset_name; + } + + /**** + * 数据集名称 + */ + public void setDataset_name(String dataset_name) { + this.dataset_name = dataset_name; + } + + /**** + * 数据样品编号 + */ + public String getSample_name() { + return this.sample_name; + } + + /**** + * 数据样品编号 + */ + public void setSample_name(String sample_name) { + this.sample_name = sample_name; + } + + /**** + * 数据样品在数据集内部编号 + */ + public String getSample_seq() { + return this.sample_seq; + } + + /**** + * 数据样品在数据集内部编号 + */ + public void setSample_seq(String sample_seq) { + this.sample_seq = sample_seq; + } + + /**** + * 赞助机构 + */ + public String getFunding_org() { + return this.funding_org; + } + + /**** + * 赞助机构 + */ + public void setFunding_org(String funding_org) { + this.funding_org = funding_org; + } + + /**** + * 公开期限 + */ + public String getPublish_rule() { + return this.publish_rule; + } + + /**** + * 公开期限 + */ + public void setPublish_rule(String publish_rule) { + this.publish_rule = publish_rule; + } + + /**** + * 测线号 + */ + public String getLine_sn() { + return this.line_sn; + } + + /**** + * 测线号 + */ + public void setLine_sn(String line_sn) { + this.line_sn = line_sn; + } + + /**** + * 测线深度 + */ + public String getLine_deep() { + return this.line_deep; + } + + /**** + * 测线深度 + */ + public void setLine_deep(String line_deep) { + this.line_deep = line_deep; + } + + /**** + * 开始经度 + */ + public String getStart_lon() { + return this.start_lon; + } + + /**** + * 开始经度 + */ + public void setStart_lon(String start_lon) { + this.start_lon = start_lon; + } + + /**** + * 开始纬度 + */ + public String getStart_lat() { + return this.start_lat; + } + + /**** + * 开始纬度 + */ + public void setStart_lat(String start_lat) { + this.start_lat = start_lat; + } + + /**** + * 结束经度 + */ + public String getEnd_lon() { + return this.end_lon; + } + + /**** + * 结束经度 + */ + public void setEnd_lon(String end_lon) { + this.end_lon = end_lon; + } + + /**** + * 结束纬度 + */ + public String getEnd_lat() { + return this.end_lat; + } + + /**** + * 结束纬度 + */ + public void setEnd_lat(String end_lat) { + this.end_lat = end_lat; + } + + /**** + * 开始时间 + */ + public LocalDateTime getStart_time() { + return this.start_time; + } + + /**** + * 开始时间 + */ + public void setStart_time(LocalDateTime start_time) { + this.start_time = start_time; + } + + /**** + * 结束时间 + */ + public LocalDateTime getEnd_time() { + return this.end_time; + } + + /**** + * 结束时间 + */ + public void setEnd_time(LocalDateTime end_time) { + this.end_time = end_time; + } + + /**** + * 上传测线轨迹文件名称 + */ + public String getTrack_file_name() { + return this.track_file_name; + } + + /**** + * 上传测线轨迹文件名称 + */ + public void setTrack_file_name(String track_file_name) { + this.track_file_name = track_file_name; + } + + /**** + * 数据格式 + */ + public String getSample_format() { + return this.sample_format; + } + + /**** + * 数据格式 + */ + public void setSample_format(String sample_format) { + this.sample_format = sample_format; + } + + /**** + * 原始数据、预处理数据、后处理数据 + */ + public String getSample_status() { + return this.sample_status; + } + + /**** + * 原始数据、预处理数据、后处理数据 + */ + public void setSample_status(String sample_status) { + this.sample_status = sample_status; + } + + /**** + * 应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次 + */ + public String getSample_tag_name() { + return this.sample_tag_name; + } + + /**** + * 应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次 + */ + public void setSample_tag_name(String sample_tag_name) { + this.sample_tag_name = sample_tag_name; + } + + /**** + * 标签对应的值，用于关联第三方系统 + */ + public String getSample_tag_value() { + return this.sample_tag_value; + } + + /**** + * 标签对应的值，用于关联第三方系统 + */ + public void setSample_tag_value(String sample_tag_value) { + this.sample_tag_value = sample_tag_value; + } + + /**** + * 备注信息 + */ + public String getSample_remark() { + return this.sample_remark; + } + + /**** + * 备注信息 + */ + public void setSample_remark(String sample_remark) { + this.sample_remark = sample_remark; + } + + /**** + * 创建时间 + */ + public LocalDateTime getCreate_time() { + return this.create_time; + } + + /**** + * 创建时间 + */ + public void setCreate_time(LocalDateTime create_time) { + this.create_time = create_time; + } + + /**** + * 覆盖宽度 + */ + public Integer getConver_width() { + return this.conver_width; + } + + /**** + * 覆盖宽度 + */ + public void setConver_width(Integer conver_width) { + this.conver_width = conver_width; + } + + /**** + * 计算出来的覆盖面积 + */ + public Integer getConver_area() { + return this.conver_area; + } + + /**** + * 计算出来的覆盖面积 + */ + public void setConver_area(Integer conver_area) { + this.conver_area = conver_area; + } + + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleLineTrack.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleLineTrack.java index a5ba0fd..0b14936 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleLineTrack.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleLineTrack.java @@ -1,123 +1,123 @@ -package cn.tsy.data.cas.idsse.dsds.model.sample; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDateTime; - -/********************************************** - * 测线轨迹 - * - * @author: ZhangXiaoQing - * @date: 2025-10-11 16:49:50 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "SAMPLE_LINE_TRACK", key = { "tsy_id" }) -public class SampleLineTrack { - private Integer tsy_id; - // 数据集内部编号 - private Integer dataset_id; - // 测线作业内部编号 - private Integer line_id; - // 步骤 - private String track_index; - // 轨迹经度 - private String track_lon; - // 轨迹纬度 - private String track_lat; - // 轨迹时间 - private LocalDateTime track_time; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 数据集内部编号 - */ - public Integer getDataset_id() { - return this.dataset_id; - } - - /**** - * 数据集内部编号 - */ - public void setDataset_id(Integer dataset_id) { - this.dataset_id = dataset_id; - } - - /**** - * 测线作业内部编号 - */ - public Integer getLine_id() { - return this.line_id; - } - - /**** - * 测线作业内部编号 - */ - public void setLine_id(Integer line_id) { - this.line_id = line_id; - } - - /**** - * 步骤 - */ - public String getTrack_index() { - return this.track_index; - } - - /**** - * 步骤 - */ - public void setTrack_index(String track_index) { - this.track_index = track_index; - } - - /**** - * 轨迹经度 - */ - public String getTrack_lon() { - return this.track_lon; - } - - /**** - * 轨迹经度 - */ - public void setTrack_lon(String track_lon) { - this.track_lon = track_lon; - } - - /**** - * 轨迹纬度 - */ - public String getTrack_lat() { - return this.track_lat; - } - - /**** - * 轨迹纬度 - */ - public void setTrack_lat(String track_lat) { - this.track_lat = track_lat; - } - - /**** - * 轨迹时间 - */ - public LocalDateTime getTrack_time() { - return this.track_time; - } - - /**** - * 轨迹时间 - */ - public void setTrack_time(LocalDateTime track_time) { - this.track_time = track_time; - } - +package cn.tsy.data.cas.idsse.dsds.model.sample; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDateTime; + +/********************************************** + * 测线轨迹 + * + * @author: ZhangXiaoQing + * @date: 2025-10-11 16:49:50 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "SAMPLE_LINE_TRACK", key = { "tsy_id" }) +public class SampleLineTrack { + private Integer tsy_id; + // 数据集内部编号 + private Integer dataset_id; + // 测线作业内部编号 + private Integer line_id; + // 步骤 + private String track_index; + // 轨迹经度 + private String track_lon; + // 轨迹纬度 + private String track_lat; + // 轨迹时间 + private LocalDateTime track_time; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 数据集内部编号 + */ + public Integer getDataset_id() { + return this.dataset_id; + } + + /**** + * 数据集内部编号 + */ + public void setDataset_id(Integer dataset_id) { + this.dataset_id = dataset_id; + } + + /**** + * 测线作业内部编号 + */ + public Integer getLine_id() { + return this.line_id; + } + + /**** + * 测线作业内部编号 + */ + public void setLine_id(Integer line_id) { + this.line_id = line_id; + } + + /**** + * 步骤 + */ + public String getTrack_index() { + return this.track_index; + } + + /**** + * 步骤 + */ + public void setTrack_index(String track_index) { + this.track_index = track_index; + } + + /**** + * 轨迹经度 + */ + public String getTrack_lon() { + return this.track_lon; + } + + /**** + * 轨迹经度 + */ + public void setTrack_lon(String track_lon) { + this.track_lon = track_lon; + } + + /**** + * 轨迹纬度 + */ + public String getTrack_lat() { + return this.track_lat; + } + + /**** + * 轨迹纬度 + */ + public void setTrack_lat(String track_lat) { + this.track_lat = track_lat; + } + + /**** + * 轨迹时间 + */ + public LocalDateTime getTrack_time() { + return this.track_time; + } + + /**** + * 轨迹时间 + */ + public void setTrack_time(LocalDateTime track_time) { + this.track_time = track_time; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleStation.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleStation.java index 2d0de6d..5cb38d8 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleStation.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleStation.java @@ -1,244 +1,244 @@ -package cn.tsy.data.cas.idsse.dsds.model.sample; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDateTime; - -/********************************************** - * 样品信息表-站位作业 - * - * @author: ZhangXiaoQing - * @date: 2025-10-11 16:51:02 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "SAMPLE_STATION", key = { "tsy_id" }) -public class SampleStation { - private Integer tsy_id; - // 数据集编号 - private Integer dataset_id; - // 数据集名称 - private String dataset_name; - // 数据样品编号 - private String sample_name; - // 数据样品在数据集内部编号 - private String sample_seq; - // 赞助机构 - private String funding_org; - // 公开期限 - private String publish_rule; - // 采样时间 - private LocalDateTime sampling_time; - // 经度 - private String sampling_lon; - // 纬度 - private String sampling_lat; - // 深度 - private String sampling_deep; - // 备注说明 - private String sample_remark; - private LocalDateTime create_time; - // 应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次 - private String sample_tag_name; - // 标签对应的值，用于关联第三方系统 - private String sample_tag_value; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 数据集编号 - */ - public Integer getDataset_id() { - return this.dataset_id; - } - - /**** - * 数据集编号 - */ - public void setDataset_id(Integer dataset_id) { - this.dataset_id = dataset_id; - } - - /**** - * 数据集名称 - */ - public String getDataset_name() { - return this.dataset_name; - } - - /**** - * 数据集名称 - */ - public void setDataset_name(String dataset_name) { - this.dataset_name = dataset_name; - } - - /**** - * 数据样品编号 - */ - public String getSample_name() { - return this.sample_name; - } - - /**** - * 数据样品编号 - */ - public void setSample_name(String sample_name) { - this.sample_name = sample_name; - } - - /**** - * 数据样品在数据集内部编号 - */ - public String getSample_seq() { - return this.sample_seq; - } - - /**** - * 数据样品在数据集内部编号 - */ - public void setSample_seq(String sample_seq) { - this.sample_seq = sample_seq; - } - - /**** - * 赞助机构 - */ - public String getFunding_org() { - return this.funding_org; - } - - /**** - * 赞助机构 - */ - public void setFunding_org(String funding_org) { - this.funding_org = funding_org; - } - - /**** - * 公开期限 - */ - public String getPublish_rule() { - return this.publish_rule; - } - - /**** - * 公开期限 - */ - public void setPublish_rule(String publish_rule) { - this.publish_rule = publish_rule; - } - - /**** - * 采样时间 - */ - public LocalDateTime getSampling_time() { - return this.sampling_time; - } - - /**** - * 采样时间 - */ - public void setSampling_time(LocalDateTime sampling_time) { - this.sampling_time = sampling_time; - } - - /**** - * 经度 - */ - public String getSampling_lon() { - return this.sampling_lon; - } - - /**** - * 经度 - */ - public void setSampling_lon(String sampling_lon) { - this.sampling_lon = sampling_lon; - } - - /**** - * 纬度 - */ - public String getSampling_lat() { - return this.sampling_lat; - } - - /**** - * 纬度 - */ - public void setSampling_lat(String sampling_lat) { - this.sampling_lat = sampling_lat; - } - - /**** - * 深度 - */ - public String getSampling_deep() { - return this.sampling_deep; - } - - /**** - * 深度 - */ - public void setSampling_deep(String sampling_deep) { - this.sampling_deep = sampling_deep; - } - - /**** - * 备注说明 - */ - public String getSample_remark() { - return this.sample_remark; - } - - /**** - * 备注说明 - */ - public void setSample_remark(String sample_remark) { - this.sample_remark = sample_remark; - } - - public LocalDateTime getCreate_time() { - return this.create_time; - } - - public void setCreate_time(LocalDateTime create_time) { - this.create_time = create_time; - } - - /**** - * 应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次 - */ - public String getSample_tag_name() { - return this.sample_tag_name; - } - - /**** - * 应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次 - */ - public void setSample_tag_name(String sample_tag_name) { - this.sample_tag_name = sample_tag_name; - } - - /**** - * 标签对应的值，用于关联第三方系统 - */ - public String getSample_tag_value() { - return this.sample_tag_value; - } - - /**** - * 标签对应的值，用于关联第三方系统 - */ - public void setSample_tag_value(String sample_tag_value) { - this.sample_tag_value = sample_tag_value; - } - +package cn.tsy.data.cas.idsse.dsds.model.sample; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDateTime; + +/********************************************** + * 样品信息表-站位作业 + * + * @author: ZhangXiaoQing + * @date: 2025-10-11 16:51:02 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "SAMPLE_STATION", key = { "tsy_id" }) +public class SampleStation { + private Integer tsy_id; + // 数据集编号 + private Integer dataset_id; + // 数据集名称 + private String dataset_name; + // 数据样品编号 + private String sample_name; + // 数据样品在数据集内部编号 + private String sample_seq; + // 赞助机构 + private String funding_org; + // 公开期限 + private String publish_rule; + // 采样时间 + private LocalDateTime sampling_time; + // 经度 + private String sampling_lon; + // 纬度 + private String sampling_lat; + // 深度 + private String sampling_deep; + // 备注说明 + private String sample_remark; + private LocalDateTime create_time; + // 应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次 + private String sample_tag_name; + // 标签对应的值，用于关联第三方系统 + private String sample_tag_value; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 数据集编号 + */ + public Integer getDataset_id() { + return this.dataset_id; + } + + /**** + * 数据集编号 + */ + public void setDataset_id(Integer dataset_id) { + this.dataset_id = dataset_id; + } + + /**** + * 数据集名称 + */ + public String getDataset_name() { + return this.dataset_name; + } + + /**** + * 数据集名称 + */ + public void setDataset_name(String dataset_name) { + this.dataset_name = dataset_name; + } + + /**** + * 数据样品编号 + */ + public String getSample_name() { + return this.sample_name; + } + + /**** + * 数据样品编号 + */ + public void setSample_name(String sample_name) { + this.sample_name = sample_name; + } + + /**** + * 数据样品在数据集内部编号 + */ + public String getSample_seq() { + return this.sample_seq; + } + + /**** + * 数据样品在数据集内部编号 + */ + public void setSample_seq(String sample_seq) { + this.sample_seq = sample_seq; + } + + /**** + * 赞助机构 + */ + public String getFunding_org() { + return this.funding_org; + } + + /**** + * 赞助机构 + */ + public void setFunding_org(String funding_org) { + this.funding_org = funding_org; + } + + /**** + * 公开期限 + */ + public String getPublish_rule() { + return this.publish_rule; + } + + /**** + * 公开期限 + */ + public void setPublish_rule(String publish_rule) { + this.publish_rule = publish_rule; + } + + /**** + * 采样时间 + */ + public LocalDateTime getSampling_time() { + return this.sampling_time; + } + + /**** + * 采样时间 + */ + public void setSampling_time(LocalDateTime sampling_time) { + this.sampling_time = sampling_time; + } + + /**** + * 经度 + */ + public String getSampling_lon() { + return this.sampling_lon; + } + + /**** + * 经度 + */ + public void setSampling_lon(String sampling_lon) { + this.sampling_lon = sampling_lon; + } + + /**** + * 纬度 + */ + public String getSampling_lat() { + return this.sampling_lat; + } + + /**** + * 纬度 + */ + public void setSampling_lat(String sampling_lat) { + this.sampling_lat = sampling_lat; + } + + /**** + * 深度 + */ + public String getSampling_deep() { + return this.sampling_deep; + } + + /**** + * 深度 + */ + public void setSampling_deep(String sampling_deep) { + this.sampling_deep = sampling_deep; + } + + /**** + * 备注说明 + */ + public String getSample_remark() { + return this.sample_remark; + } + + /**** + * 备注说明 + */ + public void setSample_remark(String sample_remark) { + this.sample_remark = sample_remark; + } + + public LocalDateTime getCreate_time() { + return this.create_time; + } + + public void setCreate_time(LocalDateTime create_time) { + this.create_time = create_time; + } + + /**** + * 应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次 + */ + public String getSample_tag_name() { + return this.sample_tag_name; + } + + /**** + * 应急搜捞、全球深渊深潜计划、崖州湾共享航次、基金委共享航次 + */ + public void setSample_tag_name(String sample_tag_name) { + this.sample_tag_name = sample_tag_name; + } + + /**** + * 标签对应的值，用于关联第三方系统 + */ + public String getSample_tag_value() { + return this.sample_tag_value; + } + + /**** + * 标签对应的值，用于关联第三方系统 + */ + public void setSample_tag_value(String sample_tag_value) { + this.sample_tag_value = sample_tag_value; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleStationTrack.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleStationTrack.java index 966df9c..abdc311 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleStationTrack.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/sample/SampleStationTrack.java @@ -1,91 +1,91 @@ -package cn.tsy.data.cas.idsse.dsds.model.sample; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDateTime; - -/********************************************** - * 航次-导航文件 - * - * @author: ZhangXiaoQing - * @date: 2025-10-11 16:51:20 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "SAMPLE_STATION_TRACK", key = { "tsy_id" }) -public class SampleStationTrack { - private Integer tsy_id; - // 航次编号 - private Integer sample_id; - // 经度 - private String nav_lon; - // 纬度 - private String nav_lat; - // 时间 - private LocalDateTime nav_time; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 航次编号 - */ - public Integer getSample_id() { - return this.sample_id; - } - - /**** - * 航次编号 - */ - public void setSample_id(Integer sample_id) { - this.sample_id = sample_id; - } - - /**** - * 经度 - */ - public String getNav_lon() { - return this.nav_lon; - } - - /**** - * 经度 - */ - public void setNav_lon(String nav_lon) { - this.nav_lon = nav_lon; - } - - /**** - * 纬度 - */ - public String getNav_lat() { - return this.nav_lat; - } - - /**** - * 纬度 - */ - public void setNav_lat(String nav_lat) { - this.nav_lat = nav_lat; - } - - /**** - * 时间 - */ - public LocalDateTime getNav_time() { - return this.nav_time; - } - - /**** - * 时间 - */ - public void setNav_time(LocalDateTime nav_time) { - this.nav_time = nav_time; - } - +package cn.tsy.data.cas.idsse.dsds.model.sample; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDateTime; + +/********************************************** + * 航次-导航文件 + * + * @author: ZhangXiaoQing + * @date: 2025-10-11 16:51:20 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "SAMPLE_STATION_TRACK", key = { "tsy_id" }) +public class SampleStationTrack { + private Integer tsy_id; + // 航次编号 + private Integer sample_id; + // 经度 + private String nav_lon; + // 纬度 + private String nav_lat; + // 时间 + private LocalDateTime nav_time; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 航次编号 + */ + public Integer getSample_id() { + return this.sample_id; + } + + /**** + * 航次编号 + */ + public void setSample_id(Integer sample_id) { + this.sample_id = sample_id; + } + + /**** + * 经度 + */ + public String getNav_lon() { + return this.nav_lon; + } + + /**** + * 经度 + */ + public void setNav_lon(String nav_lon) { + this.nav_lon = nav_lon; + } + + /**** + * 纬度 + */ + public String getNav_lat() { + return this.nav_lat; + } + + /**** + * 纬度 + */ + public void setNav_lat(String nav_lat) { + this.nav_lat = nav_lat; + } + + /**** + * 时间 + */ + public LocalDateTime getNav_time() { + return this.nav_time; + } + + /**** + * 时间 + */ + public void setNav_time(LocalDateTime nav_time) { + this.nav_time = nav_time; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageLog.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageLog.java index 74282e5..4c1812a 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageLog.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageLog.java @@ -1,122 +1,122 @@ -package cn.tsy.data.cas.idsse.dsds.model.voyage; - -import cn.hme.framework.jdbc.core.HmeTable; - -/********************************************** - * 航次日志记录 - * - * @author: ZhangXiaoQing - * @date: 2025-10-11 16:52:52 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "VOYAGE_LOG", key = { "tsy_id" }) -public class VoyageLog { - private Integer tsy_id; - // 航次名称 - private Integer voyage_id; - // 操作员编号 - private Integer optr_id; - // 操作员名称 - private String optr_name; - // 登录名称 - private String login_name; - // 日志类型 - private String log_type; - // 日志值 - private String log_value; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 航次名称 - */ - public Integer getVoyage_id() { - return this.voyage_id; - } - - /**** - * 航次名称 - */ - public void setVoyage_id(Integer voyage_id) { - this.voyage_id = voyage_id; - } - - /**** - * 操作员编号 - */ - public Integer getOptr_id() { - return this.optr_id; - } - - /**** - * 操作员编号 - */ - public void setOptr_id(Integer optr_id) { - this.optr_id = optr_id; - } - - /**** - * 操作员名称 - */ - public String getOptr_name() { - return this.optr_name; - } - - /**** - * 操作员名称 - */ - public void setOptr_name(String optr_name) { - this.optr_name = optr_name; - } - - /**** - * 登录名称 - */ - public String getLogin_name() { - return this.login_name; - } - - /**** - * 登录名称 - */ - public void setLogin_name(String login_name) { - this.login_name = login_name; - } - - /**** - * 日志类型 - */ - public String getLog_type() { - return this.log_type; - } - - /**** - * 日志类型 - */ - public void setLog_type(String log_type) { - this.log_type = log_type; - } - - /**** - * 日志值 - */ - public String getLog_value() { - return this.log_value; - } - - /**** - * 日志值 - */ - public void setLog_value(String log_value) { - this.log_value = log_value; - } - +package cn.tsy.data.cas.idsse.dsds.model.voyage; + +import cn.hme.framework.jdbc.core.HmeTable; + +/********************************************** + * 航次日志记录 + * + * @author: ZhangXiaoQing + * @date: 2025-10-11 16:52:52 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "VOYAGE_LOG", key = { "tsy_id" }) +public class VoyageLog { + private Integer tsy_id; + // 航次名称 + private Integer voyage_id; + // 操作员编号 + private Integer optr_id; + // 操作员名称 + private String optr_name; + // 登录名称 + private String login_name; + // 日志类型 + private String log_type; + // 日志值 + private String log_value; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 航次名称 + */ + public Integer getVoyage_id() { + return this.voyage_id; + } + + /**** + * 航次名称 + */ + public void setVoyage_id(Integer voyage_id) { + this.voyage_id = voyage_id; + } + + /**** + * 操作员编号 + */ + public Integer getOptr_id() { + return this.optr_id; + } + + /**** + * 操作员编号 + */ + public void setOptr_id(Integer optr_id) { + this.optr_id = optr_id; + } + + /**** + * 操作员名称 + */ + public String getOptr_name() { + return this.optr_name; + } + + /**** + * 操作员名称 + */ + public void setOptr_name(String optr_name) { + this.optr_name = optr_name; + } + + /**** + * 登录名称 + */ + public String getLogin_name() { + return this.login_name; + } + + /**** + * 登录名称 + */ + public void setLogin_name(String login_name) { + this.login_name = login_name; + } + + /**** + * 日志类型 + */ + public String getLog_type() { + return this.log_type; + } + + /**** + * 日志类型 + */ + public void setLog_type(String log_type) { + this.log_type = log_type; + } + + /**** + * 日志值 + */ + public String getLog_value() { + return this.log_value; + } + + /**** + * 日志值 + */ + public void setLog_value(String log_value) { + this.log_value = log_value; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageMember.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageMember.java index 23b4339..0b30d9e 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageMember.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageMember.java @@ -1,243 +1,243 @@ -package cn.tsy.data.cas.idsse.dsds.model.voyage; - -import cn.hme.framework.jdbc.core.HmeTable; - -/********************************************** - * 航次参航人员信息 - * - * @author: ZhangXiaoQing - * @date: 2025-10-11 16:53:06 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "VOYAGE_MEMBER", key = { "tsy_id" }) -public class VoyageMember { - private Integer tsy_id; - // 航次编号 - private Integer voyage_id; - // 对应文件名称 - private Integer file_id; - // 参航人员姓名 - private String member_name; - // 参航人员性别 - private String member_sex; - // 参航人员生日 - private String member_birthday; - // 参航人员单位 - private String member_unit; - // 参航人员职责 - private String member_dept; - // 联系电话 - private String member_tel; - // 证件号码 - private String member_cert; - // 银行名称 - private String bank_name; - // 银行卡号码 - private String bank_card; - // 开户行 - private String bank_addr; - private String member_remark; - // 船上房间号码 - private String ship_room_addr; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 航次编号 - */ - public Integer getVoyage_id() { - return this.voyage_id; - } - - /**** - * 航次编号 - */ - public void setVoyage_id(Integer voyage_id) { - this.voyage_id = voyage_id; - } - - /**** - * 对应文件名称 - */ - public Integer getFile_id() { - return this.file_id; - } - - /**** - * 对应文件名称 - */ - public void setFile_id(Integer file_id) { - this.file_id = file_id; - } - - /**** - * 参航人员姓名 - */ - public String getMember_name() { - return this.member_name; - } - - /**** - * 参航人员姓名 - */ - public void setMember_name(String member_name) { - this.member_name = member_name; - } - - /**** - * 参航人员性别 - */ - public String getMember_sex() { - return this.member_sex; - } - - /**** - * 参航人员性别 - */ - public void setMember_sex(String member_sex) { - this.member_sex = member_sex; - } - - /**** - * 参航人员生日 - */ - public String getMember_birthday() { - return this.member_birthday; - } - - /**** - * 参航人员生日 - */ - public void setMember_birthday(String member_birthday) { - this.member_birthday = member_birthday; - } - - /**** - * 参航人员单位 - */ - public String getMember_unit() { - return this.member_unit; - } - - /**** - * 参航人员单位 - */ - public void setMember_unit(String member_unit) { - this.member_unit = member_unit; - } - - /**** - * 参航人员职责 - */ - public String getMember_dept() { - return this.member_dept; - } - - /**** - * 参航人员职责 - */ - public void setMember_dept(String member_dept) { - this.member_dept = member_dept; - } - - /**** - * 联系电话 - */ - public String getMember_tel() { - return this.member_tel; - } - - /**** - * 联系电话 - */ - public void setMember_tel(String member_tel) { - this.member_tel = member_tel; - } - - /**** - * 证件号码 - */ - public String getMember_cert() { - return this.member_cert; - } - - /**** - * 证件号码 - */ - public void setMember_cert(String member_cert) { - this.member_cert = member_cert; - } - - /**** - * 银行名称 - */ - public String getBank_name() { - return this.bank_name; - } - - /**** - * 银行名称 - */ - public void setBank_name(String bank_name) { - this.bank_name = bank_name; - } - - /**** - * 银行卡号码 - */ - public String getBank_card() { - return this.bank_card; - } - - /**** - * 银行卡号码 - */ - public void setBank_card(String bank_card) { - this.bank_card = bank_card; - } - - /**** - * 开户行 - */ - public String getBank_addr() { - return this.bank_addr; - } - - /**** - * 开户行 - */ - public void setBank_addr(String bank_addr) { - this.bank_addr = bank_addr; - } - - public String getMember_remark() { - return this.member_remark; - } - - public void setMember_remark(String member_remark) { - this.member_remark = member_remark; - } - - /**** - * 船上房间号码 - */ - public String getShip_room_addr() { - return this.ship_room_addr; - } - - /**** - * 船上房间号码 - */ - public void setShip_room_addr(String ship_room_addr) { - this.ship_room_addr = ship_room_addr; - } - +package cn.tsy.data.cas.idsse.dsds.model.voyage; + +import cn.hme.framework.jdbc.core.HmeTable; + +/********************************************** + * 航次参航人员信息 + * + * @author: ZhangXiaoQing + * @date: 2025-10-11 16:53:06 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "VOYAGE_MEMBER", key = { "tsy_id" }) +public class VoyageMember { + private Integer tsy_id; + // 航次编号 + private Integer voyage_id; + // 对应文件名称 + private Integer file_id; + // 参航人员姓名 + private String member_name; + // 参航人员性别 + private String member_sex; + // 参航人员生日 + private String member_birthday; + // 参航人员单位 + private String member_unit; + // 参航人员职责 + private String member_dept; + // 联系电话 + private String member_tel; + // 证件号码 + private String member_cert; + // 银行名称 + private String bank_name; + // 银行卡号码 + private String bank_card; + // 开户行 + private String bank_addr; + private String member_remark; + // 船上房间号码 + private String ship_room_addr; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 航次编号 + */ + public Integer getVoyage_id() { + return this.voyage_id; + } + + /**** + * 航次编号 + */ + public void setVoyage_id(Integer voyage_id) { + this.voyage_id = voyage_id; + } + + /**** + * 对应文件名称 + */ + public Integer getFile_id() { + return this.file_id; + } + + /**** + * 对应文件名称 + */ + public void setFile_id(Integer file_id) { + this.file_id = file_id; + } + + /**** + * 参航人员姓名 + */ + public String getMember_name() { + return this.member_name; + } + + /**** + * 参航人员姓名 + */ + public void setMember_name(String member_name) { + this.member_name = member_name; + } + + /**** + * 参航人员性别 + */ + public String getMember_sex() { + return this.member_sex; + } + + /**** + * 参航人员性别 + */ + public void setMember_sex(String member_sex) { + this.member_sex = member_sex; + } + + /**** + * 参航人员生日 + */ + public String getMember_birthday() { + return this.member_birthday; + } + + /**** + * 参航人员生日 + */ + public void setMember_birthday(String member_birthday) { + this.member_birthday = member_birthday; + } + + /**** + * 参航人员单位 + */ + public String getMember_unit() { + return this.member_unit; + } + + /**** + * 参航人员单位 + */ + public void setMember_unit(String member_unit) { + this.member_unit = member_unit; + } + + /**** + * 参航人员职责 + */ + public String getMember_dept() { + return this.member_dept; + } + + /**** + * 参航人员职责 + */ + public void setMember_dept(String member_dept) { + this.member_dept = member_dept; + } + + /**** + * 联系电话 + */ + public String getMember_tel() { + return this.member_tel; + } + + /**** + * 联系电话 + */ + public void setMember_tel(String member_tel) { + this.member_tel = member_tel; + } + + /**** + * 证件号码 + */ + public String getMember_cert() { + return this.member_cert; + } + + /**** + * 证件号码 + */ + public void setMember_cert(String member_cert) { + this.member_cert = member_cert; + } + + /**** + * 银行名称 + */ + public String getBank_name() { + return this.bank_name; + } + + /**** + * 银行名称 + */ + public void setBank_name(String bank_name) { + this.bank_name = bank_name; + } + + /**** + * 银行卡号码 + */ + public String getBank_card() { + return this.bank_card; + } + + /**** + * 银行卡号码 + */ + public void setBank_card(String bank_card) { + this.bank_card = bank_card; + } + + /**** + * 开户行 + */ + public String getBank_addr() { + return this.bank_addr; + } + + /**** + * 开户行 + */ + public void setBank_addr(String bank_addr) { + this.bank_addr = bank_addr; + } + + public String getMember_remark() { + return this.member_remark; + } + + public void setMember_remark(String member_remark) { + this.member_remark = member_remark; + } + + /**** + * 船上房间号码 + */ + public String getShip_room_addr() { + return this.ship_room_addr; + } + + /**** + * 船上房间号码 + */ + public void setShip_room_addr(String ship_room_addr) { + this.ship_room_addr = ship_room_addr; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageNavigation.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageNavigation.java index 8e253ee..28e244a 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageNavigation.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageNavigation.java @@ -1,106 +1,106 @@ -package cn.tsy.data.cas.idsse.dsds.model.voyage; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDateTime; - -/********************************************** -* 航次-导航文件 -* @author: ZhangXiaoQing -* @date: 2025-10-11 16:53:27 -* @version: v3.2025 -* @email: revisit@126.com -* @Company: www.hmesoft.cn -*/ -@HmeTable(name = "VOYAGE_NAVIGATION", key={"tsy_id"}) -public class VoyageNavigation{ - private Integer tsy_id; - //航次编号 - private Integer voyage_id; - //导航文件编号 - private Integer file_id; - //经度 - private String nav_lon; - //纬度 - private String nav_lat; - //时间 - private LocalDateTime nav_time; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 航次编号 - */ - public Integer getVoyage_id() { - return this.voyage_id; - } - - /**** - * 航次编号 - */ - public void setVoyage_id(Integer voyage_id) { - this.voyage_id = voyage_id; - } - - /**** - * 导航文件编号 - */ - public Integer getFile_id() { - return this.file_id; - } - - /**** - * 导航文件编号 - */ - public void setFile_id(Integer file_id) { - this.file_id = file_id; - } - - /**** - * 经度 - */ - public String getNav_lon() { - return this.nav_lon; - } - - /**** - * 经度 - */ - public void setNav_lon(String nav_lon) { - this.nav_lon = nav_lon; - } - - /**** - * 纬度 - */ - public String getNav_lat() { - return this.nav_lat; - } - - /**** - * 纬度 - */ - public void setNav_lat(String nav_lat) { - this.nav_lat = nav_lat; - } - - /**** - * 时间 - */ - public LocalDateTime getNav_time() { - return this.nav_time; - } - - /**** - * 时间 - */ - public void setNav_time(LocalDateTime nav_time) { - this.nav_time = nav_time; - } - +package cn.tsy.data.cas.idsse.dsds.model.voyage; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDateTime; + +/********************************************** +* 航次-导航文件 +* @author: ZhangXiaoQing +* @date: 2025-10-11 16:53:27 +* @version: v3.2025 +* @email: revisit@126.com +* @Company: www.hmesoft.cn +*/ +@HmeTable(name = "VOYAGE_NAVIGATION", key={"tsy_id"}) +public class VoyageNavigation{ + private Integer tsy_id; + //航次编号 + private Integer voyage_id; + //导航文件编号 + private Integer file_id; + //经度 + private String nav_lon; + //纬度 + private String nav_lat; + //时间 + private LocalDateTime nav_time; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 航次编号 + */ + public Integer getVoyage_id() { + return this.voyage_id; + } + + /**** + * 航次编号 + */ + public void setVoyage_id(Integer voyage_id) { + this.voyage_id = voyage_id; + } + + /**** + * 导航文件编号 + */ + public Integer getFile_id() { + return this.file_id; + } + + /**** + * 导航文件编号 + */ + public void setFile_id(Integer file_id) { + this.file_id = file_id; + } + + /**** + * 经度 + */ + public String getNav_lon() { + return this.nav_lon; + } + + /**** + * 经度 + */ + public void setNav_lon(String nav_lon) { + this.nav_lon = nav_lon; + } + + /**** + * 纬度 + */ + public String getNav_lat() { + return this.nav_lat; + } + + /**** + * 纬度 + */ + public void setNav_lat(String nav_lat) { + this.nav_lat = nav_lat; + } + + /**** + * 时间 + */ + public LocalDateTime getNav_time() { + return this.nav_time; + } + + /**** + * 时间 + */ + public void setNav_time(LocalDateTime nav_time) { + this.nav_time = nav_time; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageReg.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageReg.java index 00869f6..6db1024 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageReg.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageReg.java @@ -1,269 +1,269 @@ -package cn.tsy.data.cas.idsse.dsds.model.voyage; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDate; -import java.time.LocalDateTime; - -/********************************************** - * 航次信息表 - * - * @author: ZhangXiaoQing - * @date: 2025-10-11 16:53:45 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "VOYAGE_REG", key = { "tsy_id" }) -public class VoyageReg { - private Integer tsy_id; - //航次名称 - private String voyage_name; - //科考船舶 - private String ship_name; - //是否涉密 - private String serect_status; - //航行开始日期 - private LocalDate voyage_start_date; - //航行结束日期 - private LocalDate voyage_end_date; - //航线描述 - private String voyage_remark; - //首席，用、分开 - private String voyage_officer; - //项目资助机构，用、分开 - private String funding_org; - //项目资助编号 - private String funding_code; - //导航文件名称 - private String navigation_file_name; - //创建时间 - private LocalDateTime create_time; - //航次状态 - private String voyage_status; - //状态变更时间 - private LocalDateTime voyage_status_time; - //航行里程 - private Integer voyage_mileage; - //航线天数，自动计算 - private Integer voyage_days; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 航次名称 - */ - public String getVoyage_name() { - return this.voyage_name; - } - - /**** - * 航次名称 - */ - public void setVoyage_name(String voyage_name) { - this.voyage_name = voyage_name; - } - - /**** - * 科考船舶 - */ - public String getShip_name() { - return this.ship_name; - } - - /**** - * 科考船舶 - */ - public void setShip_name(String ship_name) { - this.ship_name = ship_name; - } - - /**** - * 是否涉密 - */ - public String getSerect_status() { - return this.serect_status; - } - - /**** - * 是否涉密 - */ - public void setSerect_status(String serect_status) { - this.serect_status = serect_status; - } - - /**** - * 航行开始日期 - */ - public LocalDate getVoyage_start_date() { - return this.voyage_start_date; - } - - /**** - * 航行开始日期 - */ - public void setVoyage_start_date(LocalDate voyage_start_date) { - this.voyage_start_date = voyage_start_date; - } - - /**** - * 航行结束日期 - */ - public LocalDate getVoyage_end_date() { - return this.voyage_end_date; - } - - /**** - * 航行结束日期 - */ - public void setVoyage_end_date(LocalDate voyage_end_date) { - this.voyage_end_date = voyage_end_date; - } - - /**** - * 航线描述 - */ - public String getVoyage_remark() { - return this.voyage_remark; - } - - /**** - * 航线描述 - */ - public void setVoyage_remark(String voyage_remark) { - this.voyage_remark = voyage_remark; - } - - /**** - * 首席，用、分开 - */ - public String getVoyage_officer() { - return this.voyage_officer; - } - - /**** - * 首席，用、分开 - */ - public void setVoyage_officer(String voyage_officer) { - this.voyage_officer = voyage_officer; - } - - /**** - * 项目资助机构，用、分开 - */ - public String getFunding_org() { - return this.funding_org; - } - - /**** - * 项目资助机构，用、分开 - */ - public void setFunding_org(String funding_org) { - this.funding_org = funding_org; - } - - /**** - * 项目资助编号 - */ - public String getFunding_code() { - return this.funding_code; - } - - /**** - * 项目资助编号 - */ - public void setFunding_code(String funding_code) { - this.funding_code = funding_code; - } - - /**** - * 导航文件名称 - */ - public String getNavigation_file_name() { - return this.navigation_file_name; - } - - /**** - * 导航文件名称 - */ - public void setNavigation_file_name(String navigation_file_name) { - this.navigation_file_name = navigation_file_name; - } - - /**** - * 创建时间 - */ - public LocalDateTime getCreate_time() { - return this.create_time; - } - - /**** - * 创建时间 - */ - public void setCreate_time(LocalDateTime create_time) { - this.create_time = create_time; - } - - /**** - * 航次状态 - */ - public String getVoyage_status() { - return this.voyage_status; - } - - /**** - * 航次状态 - */ - public void setVoyage_status(String voyage_status) { - this.voyage_status = voyage_status; - } - - /**** - * 状态变更时间 - */ - public LocalDateTime getVoyage_status_time() { - return this.voyage_status_time; - } - - /**** - * 状态变更时间 - */ - public void setVoyage_status_time(LocalDateTime voyage_status_time) { - this.voyage_status_time = voyage_status_time; - } - - /**** - * 航行里程 - */ - public Integer getVoyage_mileage() { - return this.voyage_mileage; - } - - /**** - * 航行里程 - */ - public void setVoyage_mileage(Integer voyage_mileage) { - this.voyage_mileage = voyage_mileage; - } - - /**** - * 航线天数，自动计算 - */ - public Integer getVoyage_days() { - return this.voyage_days; - } - - /**** - * 航线天数，自动计算 - */ - public void setVoyage_days(Integer voyage_days) { - this.voyage_days = voyage_days; - } - - +package cn.tsy.data.cas.idsse.dsds.model.voyage; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/********************************************** + * 航次信息表 + * + * @author: ZhangXiaoQing + * @date: 2025-10-11 16:53:45 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "VOYAGE_REG", key = { "tsy_id" }) +public class VoyageReg { + private Integer tsy_id; + //航次名称 + private String voyage_name; + //科考船舶 + private String ship_name; + //是否涉密 + private String serect_status; + //航行开始日期 + private LocalDate voyage_start_date; + //航行结束日期 + private LocalDate voyage_end_date; + //航线描述 + private String voyage_remark; + //首席，用、分开 + private String voyage_officer; + //项目资助机构，用、分开 + private String funding_org; + //项目资助编号 + private String funding_code; + //导航文件名称 + private String navigation_file_name; + //创建时间 + private LocalDateTime create_time; + //航次状态 + private String voyage_status; + //状态变更时间 + private LocalDateTime voyage_status_time; + //航行里程 + private Integer voyage_mileage; + //航线天数，自动计算 + private Integer voyage_days; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 航次名称 + */ + public String getVoyage_name() { + return this.voyage_name; + } + + /**** + * 航次名称 + */ + public void setVoyage_name(String voyage_name) { + this.voyage_name = voyage_name; + } + + /**** + * 科考船舶 + */ + public String getShip_name() { + return this.ship_name; + } + + /**** + * 科考船舶 + */ + public void setShip_name(String ship_name) { + this.ship_name = ship_name; + } + + /**** + * 是否涉密 + */ + public String getSerect_status() { + return this.serect_status; + } + + /**** + * 是否涉密 + */ + public void setSerect_status(String serect_status) { + this.serect_status = serect_status; + } + + /**** + * 航行开始日期 + */ + public LocalDate getVoyage_start_date() { + return this.voyage_start_date; + } + + /**** + * 航行开始日期 + */ + public void setVoyage_start_date(LocalDate voyage_start_date) { + this.voyage_start_date = voyage_start_date; + } + + /**** + * 航行结束日期 + */ + public LocalDate getVoyage_end_date() { + return this.voyage_end_date; + } + + /**** + * 航行结束日期 + */ + public void setVoyage_end_date(LocalDate voyage_end_date) { + this.voyage_end_date = voyage_end_date; + } + + /**** + * 航线描述 + */ + public String getVoyage_remark() { + return this.voyage_remark; + } + + /**** + * 航线描述 + */ + public void setVoyage_remark(String voyage_remark) { + this.voyage_remark = voyage_remark; + } + + /**** + * 首席，用、分开 + */ + public String getVoyage_officer() { + return this.voyage_officer; + } + + /**** + * 首席，用、分开 + */ + public void setVoyage_officer(String voyage_officer) { + this.voyage_officer = voyage_officer; + } + + /**** + * 项目资助机构，用、分开 + */ + public String getFunding_org() { + return this.funding_org; + } + + /**** + * 项目资助机构，用、分开 + */ + public void setFunding_org(String funding_org) { + this.funding_org = funding_org; + } + + /**** + * 项目资助编号 + */ + public String getFunding_code() { + return this.funding_code; + } + + /**** + * 项目资助编号 + */ + public void setFunding_code(String funding_code) { + this.funding_code = funding_code; + } + + /**** + * 导航文件名称 + */ + public String getNavigation_file_name() { + return this.navigation_file_name; + } + + /**** + * 导航文件名称 + */ + public void setNavigation_file_name(String navigation_file_name) { + this.navigation_file_name = navigation_file_name; + } + + /**** + * 创建时间 + */ + public LocalDateTime getCreate_time() { + return this.create_time; + } + + /**** + * 创建时间 + */ + public void setCreate_time(LocalDateTime create_time) { + this.create_time = create_time; + } + + /**** + * 航次状态 + */ + public String getVoyage_status() { + return this.voyage_status; + } + + /**** + * 航次状态 + */ + public void setVoyage_status(String voyage_status) { + this.voyage_status = voyage_status; + } + + /**** + * 状态变更时间 + */ + public LocalDateTime getVoyage_status_time() { + return this.voyage_status_time; + } + + /**** + * 状态变更时间 + */ + public void setVoyage_status_time(LocalDateTime voyage_status_time) { + this.voyage_status_time = voyage_status_time; + } + + /**** + * 航行里程 + */ + public Integer getVoyage_mileage() { + return this.voyage_mileage; + } + + /**** + * 航行里程 + */ + public void setVoyage_mileage(Integer voyage_mileage) { + this.voyage_mileage = voyage_mileage; + } + + /**** + * 航线天数，自动计算 + */ + public Integer getVoyage_days() { + return this.voyage_days; + } + + /**** + * 航线天数，自动计算 + */ + public void setVoyage_days(Integer voyage_days) { + this.voyage_days = voyage_days; + } + + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageRegOptr.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageRegOptr.java index dadbd28..44768c1 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageRegOptr.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/model/voyage/VoyageRegOptr.java @@ -1,58 +1,58 @@ -package cn.tsy.data.cas.idsse.dsds.model.voyage; - -import cn.hme.framework.jdbc.core.HmeTable; - -/********************************************** -* 操作员-航次对应表 -* @author: ZhangXiaoQing -* @date: 2025-10-22 15:54:22 -* @version: v3.2025 -* @email: revisit@126.com -* @Company: www.hmesoft.cn -*/ -@HmeTable(name = "VOYAGE_REG_OPTR", key={"TSY_ID"}) -public class VoyageRegOptr{ - private Integer tsy_id; - //操作员编号 - private Integer optr_id; - //航次编号 - private Integer voyage_id; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 操作员编号 - */ - public Integer getOptr_id() { - return this.optr_id; - } - - /**** - * 操作员编号 - */ - public void setOptr_id(Integer optr_id) { - this.optr_id = optr_id; - } - - /**** - * 航次编号 - */ - public Integer getVoyage_id() { - return this.voyage_id; - } - - /**** - * 航次编号 - */ - public void setVoyage_id(Integer voyage_id) { - this.voyage_id = voyage_id; - } - - +package cn.tsy.data.cas.idsse.dsds.model.voyage; + +import cn.hme.framework.jdbc.core.HmeTable; + +/********************************************** +* 操作员-航次对应表 +* @author: ZhangXiaoQing +* @date: 2025-10-22 15:54:22 +* @version: v3.2025 +* @email: revisit@126.com +* @Company: www.hmesoft.cn +*/ +@HmeTable(name = "VOYAGE_REG_OPTR", key={"TSY_ID"}) +public class VoyageRegOptr{ + private Integer tsy_id; + //操作员编号 + private Integer optr_id; + //航次编号 + private Integer voyage_id; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 操作员编号 + */ + public Integer getOptr_id() { + return this.optr_id; + } + + /**** + * 操作员编号 + */ + public void setOptr_id(Integer optr_id) { + this.optr_id = optr_id; + } + + /**** + * 航次编号 + */ + public Integer getVoyage_id() { + return this.voyage_id; + } + + /**** + * 航次编号 + */ + public void setVoyage_id(Integer voyage_id) { + this.voyage_id = voyage_id; + } + + } \ No newline at end of file diff --git a/src/main/java/jdbc.properties b/src/main/java/jdbc.properties index a7e02d7..70d8168 100644 --- a/src/main/java/jdbc.properties +++ b/src/main/java/jdbc.properties @@ -1,18 +1,18 @@ -#JdbcUrl=jdbc:mysql://116.211.2.76:65206/aigg2025?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true -#JdbcUser=root -#JdbcPassword=hm2022 - -JdbcUrl=jdbc:postgresql://1.95.42.191:5432/idsse_dsds -JdbcUser=postgres -JdbcPassword=a654321a - -#JdbcUrl=jdbc:mysql://1.95.42.191:3306/xacom_tk?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true -#JdbcUser=root -#JdbcPassword=a654321a -JdbcCheckouttimeout=30000 -JdbcMaxpoolsize=200 - -#test.JdbcDriverClass=org.sqlite.JDBC -#test.JdbcUrl=jdbc:sqlite://d:\\gopmas.db -#test.JdbcCheckouttimeout=30000 +#JdbcUrl=jdbc:mysql://116.211.2.76:65206/aigg2025?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true +#JdbcUser=root +#JdbcPassword=hm2022 + +JdbcUrl=jdbc:postgresql://1.95.42.191:5432/idsse_dsds +JdbcUser=postgres +JdbcPassword=a654321a + +#JdbcUrl=jdbc:mysql://1.95.42.191:3306/xacom_tk?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true +#JdbcUser=root +#JdbcPassword=a654321a +JdbcCheckouttimeout=30000 +JdbcMaxpoolsize=200 + +#test.JdbcDriverClass=org.sqlite.JDBC +#test.JdbcUrl=jdbc:sqlite://d:\\gopmas.db +#test.JdbcCheckouttimeout=30000 #test.JdbcMaxpoolsize=200 \ No newline at end of file diff --git a/src/main/webapp/META-INF/MANIFEST.MF b/src/main/webapp/META-INF/MANIFEST.MF index 254272e..5e94951 100644 --- a/src/main/webapp/META-INF/MANIFEST.MF +++ b/src/main/webapp/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ -Manifest-Version: 1.0 -Class-Path: - +Manifest-Version: 1.0 +Class-Path: +